GPII-311: Removed excess comments and some whitespacing