Finish refactoring feature generator