Refactoring Room.