Refactors Generators