Eval: Refactor a bit