fixed commented issues from pull request