Refactor evaluators