Review followup of #6374

[AdityaSripal]

Description

Addresses comments from @fedekunze on #6374

#6374 (review)

---

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

[codecov]

Codecov Report

Merging #6430 into master will increase coverage by 0.04%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #6430      +/-   ##
==========================================
+ Coverage   55.67%   55.72%   +0.04%     
==========================================
  Files         465      465              
  Lines       27782    27782              
==========================================
+ Hits        15469    15481      +12     
+ Misses      11206    11197       -9     
+ Partials     1107     1104       -3     

[colin-axner]

ACK

[alexanderbez]

LGTM