Changed names and removed grade comments