Refactored out expression evaluations to Evaluators::ExpressionEvaluator class