addressing further review comments by @aledsage to previous pull request
Merge pull request #2 from ahgittin/tidy

addressing further review comments by @aledsage to previous pull request