Updated in response to pull request comments