refactoring generation script: simplifying, renaming