Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: J. Ryan Stinnett <91e4c98f79b38ce04c052c188926e2d9ae2a3b28@gmail.com>
matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk