Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Jeff Boruszak <a95dcccf69ddaf2a04efcf444b3a96b473cdff9b@users.noreply.github.com>
hashicorp/consul,hashicorp/consul,hashicorp/consul,hashicorp/consul