Grade calculation is working and refactored (to necessity)