these are the updates from the code review
Merge pull request #152 from ChristianMurphy/updates-from-codereview

these are the updates from the code review