Small updates to #6713

[clevinson]

Description

Few minor updates to address comments from @alexanderbez that came in after merge.

Ref: #6713

---

Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

• Targeted PR against correct branch (see CONTRIBUTING.md)
• Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
• Code follows the module structure standards.
• Wrote unit and integration tests
• Updated relevant documentation (docs/) or specification (x/<module>/spec/)
• Added relevant godoc comments.
• Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
• Re-reviewed Files changed in the Github PR explorer
• Review Codecov Report in the comment section below once CI passes

[codecov]

Codecov Report

Merging #6777 into master will decrease coverage by 2.58%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #6777      +/-   ##
==========================================
- Coverage   59.68%   57.09%   -2.59%     
==========================================
  Files         389      346      -43     
  Lines       25257    20179    -5078     
==========================================
- Hits        15075    11522    -3553     
+ Misses       9060     7803    -1257     
+ Partials     1122      854     -268