Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Matthew Hodgson <f80d0ca101e967b50b730ddf8e8aca0de85e8df6@matrix.org>
matrix-org/matrix-doc,matrix-org/matrix-doc,matrix-org/matrix-doc,matrix-org/matrix-doc