Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Igor Konnov <4dfe4620360657ec70e6ae35d4efd09432b6b31e@gmail.com>
tendermint/tendermint,tendermint/tendermint,tendermint/tendermint,tendermint/tendermint