Inital clean up
Edits
first review