Refactoring rooms