Refactor room design out of the controller