Address concerns in review of pull request