Collaborative Room  - Refactor and clean code