Address pull request feedback