Address some of the GAComments Part II
Clean up code