- addressed code review issues #2 from pull request #1439