Addressing pull request comments.