more refactoring towards a system with 2 kinds of graders