Cleanup and edits
Cleanup and edits