Further Edits

Cleanup