MODIFIED: adjusted comments and notes

General clean up of code