Changes based on comments from pull request