Refactor room-viewer module