updating based on pull request feedback