Unified comment structure

Sorry, my comment structure didn't follow yours - I have amended this.