clean up some of the basic style issues