Refactor EvalModel