edits from code review
Merge pull request #11 from petebrooks/code_review

edits from code review