Improve evaluator