refactor graders