Fixes comments from pull request