neatened up

changed stuff prior to mass reformat