take suggestions from pull request