code cleanup
choosing evaluator