minor changes based on pull request feedback