added suggestions from pull request