room gen refactoring complete