remove more cruft
Make it pretty.