changes from pull request feedback