Clean up RoomVC some more