Small refactor, to make it clearer whats happening
Small refactor, to make it clearer whats happening

vector-im/riot-web,vector-im/vector-web,vector-im/riot-web,vector-im/vector-web,vector-im/riot-web,martindale/vector,vector-im/riot-web,vector-im/vector-web,martindale/vector,vector-im/vector-web,vector-im/riot-web,vector-im/vector-web,vector-im/riot-web