clean up extraneous mess
tidied up more