Addressed comments from pull request