Changes based on pull request review