neatened some things up