Patch Set 1: Looks good to me, but someone else must approve

Let's do a format of existing lines to bring them up to speed and then we can fix this subsequently. Having things removed on save will save everyone time and effort later ...