Cleaning-up some of the comments that had been previously added.