refactor Evaluator/ExpressionBuilder'