incorporate some feedback from pull request