cleaning up some of the formating and things