refactored grader yay :)