remove "stuff", clean up formatting