Grading method refactor