address Pull Request comments