Eliminated unneeded method parameters and fixed a naming error with the expression evaluator