Clean up logic in CheckEvaluator