updated per pull request feedback