fixed commented issues from pull request
fixed commented issues from pull request