MathUtil moved to helper
Refactoring errors removed