Try simplifying complex method using a proc
Merge branch 'feature/generators'