Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Mayeul Cantan <a9e75e7b683f6eb226d9ccc05e699eee33e6c945@gmail.com>
matrix-org/matrix-doc,matrix-org/matrix-doc,matrix-org/matrix-doc,matrix-org/matrix-doc