incorporated feedback from pull request