Refactoring controller and partial Rooms