Fixing issues per Pull Request feedback