some code cleanup and an attempt at getting the room list