Code review comments

Added code review comments and emailed word document
Merge pull request #2 from beauholland/master

Merging @beauholland code review