Addressed code review issues from pull request.