Some methods moved out of MathUtil, some renaming