Fixed comments from pull request