Applying some of the feedback from review Co-authored-by: Freddy <freddygv@users.noreply.github.com> Co-authored-by: David Yu <dyu@hashicorp.com>