Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: David Yu <d2c4da7d6ea264fda124d8d8d8780e90b8d0b85a@hashicorp.com>
hashicorp/consul,hashicorp/consul,hashicorp/consul,hashicorp/consul