Clean up and edits