Cleaned up grader