small evaluator refactoring