addresses comments in pull request