Added comments in all the committed classes and removed some unnecessary local variables