Create GeneratorUtils module
Remove code smells
Merge branch 'feature/clean_up' into develop
Gemify v1.4.4