Adding some support for letter grade computation and cleaned up some
names