Square Equation V1.032 -- cleaning up