apply code review feedback
Merge pull request #7 from joshby247/develop

apply code review feedback