Neatened up, commented.