addressing pull request comments