clean up
reformat files
this a mess