Incorporate first part of pull request feedback