Addresses issues brought up by the pull request