slight re-org of Evaluator