Started cleaning up RoomBookingController code