Fixed some comments from pull request.