Cleanup & edits

Cleanup & edits