Refactored Evaluator