Further pull request comments addressed