Code reordered a bit
Commented and polished grader.js