refactoring rooms