Apply suggestions from code review

Commit

209 days ago

Apply suggestions from code review Co-authored-by: Travis Ralston <travisr@matrix.org>