refactored some additional code in create room