reorganizing, renaming, and commenting in room.controller and room.html