neatened it up a bit