Refactor evaluation.