improvmenets based on pull request feedback