incorporate feedback from pull request