room refactoring