Fixed comments from pull request code review