refactoring room changes