Clean some code in RoomController