Refactor room alias creation code