Fixed per pull request feedback