Changed some objects to primatives in MathOps