Refactoring room gen continues...