Neatened up some comments