changes from pull request code review