Refactoring Generators