Code review changes
Merge pull request #23 from taylorzr/code-review-changes

Code review changes