Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: Anca Zamfir <4a01778ad549089af2b89f056209f652ad1ad83c@users.noreply.github.com>

tendermint/tendermint,tendermint/tendermint,tendermint/tendermint,tendermint/tendermint