changes made per code review on Monday
Merge pull request #108 from dontmitch/code_review

changes made per code review on Monday