Addressed code review items from pull request