Made grading computations faster by simplifying grading sets.