incorporating some pull request feedback