address remaining pull request comments