corrected range on Jop#grade_up
small consistency refactorings