Final Edits to code and comments