Collaborative Room  - Refactor