Update for comments from pull request