small code improvements
Merge pull request #1 from jvwilge/code-review

small code improvements