addressing comments from pull request