Cleanup and edits