Addresses pull request feedback