Refactor evaluator.