Addressing pull request comments