Final edits

Cleaned up the comments