Updated to address review comments for pull request #25

Misc cosmetic and readability enhancements