minor code clean ups
Merge pull request #302 from jofomah/refactor/minor-code-clean-ups

minor code clean ups