Improved grader.js