Refactor evaluator