Refactoring feature generators.