Refactoring generation/handlers: decreasing cyclo complexity
Refactoring generation/handlers: decreasing cyclo complexity

goaltools/goal,anonx/sunplate,anonx/sunplate,goaltools/goal,anonx/sunplate,goaltools/goal