neatened up a bit