Refactor eval_* methods in evaluation