Clean and improve grader.js