Refactorings, clean-ups and formatting
Templatize Integrator class
Simplify some conditionals
Simplify utm points normalization