addressed some of the feedback in the PR