Changes from pull request feedback