Moved room reader into a separate class