clean up
All kinds of edits