Clean up grader and add logging