Neatened up slightly