diff --git a/.changelog/unreleased/breaking-changes/622-v0.37.0-cleanup.md b/.changelog/unreleased/breaking-changes/622-v0.37.0-cleanup.md
new file mode 100644
index 000000000..4d9bc2dd0
--- /dev/null
+++ b/.changelog/unreleased/breaking-changes/622-v0.37.0-cleanup.md
@@ -0,0 +1,2 @@
+- Code clean-up remained from v0.37.0 release
+- ([#622](https://github.com/cosmos/ibc-rs/issues/622))
\ No newline at end of file
diff --git a/.changelog/v0.37.0/bug-fixes/feature/577-prefixed-denom-for-scale-codec.md b/.changelog/v0.37.0/features/577-prefixed-denom-for-scale-codec.md
similarity index 100%
rename from .changelog/v0.37.0/bug-fixes/feature/577-prefixed-denom-for-scale-codec.md
rename to .changelog/v0.37.0/features/577-prefixed-denom-for-scale-codec.md
diff --git a/.changelog/v0.37.0/bug-fixes/feature/581-add-de-serialization-moduleextras.md b/.changelog/v0.37.0/features/581-add-de-serialization-moduleextras.md
similarity index 100%
rename from .changelog/v0.37.0/bug-fixes/feature/581-add-de-serialization-moduleextras.md
rename to .changelog/v0.37.0/features/581-add-de-serialization-moduleextras.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45982f5a0..cb5a9e6e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ There are consensus-breaking changes.
 - Check if `ClientStatePath` is empty during client creation process
   ([#604](https://github.com/cosmos/ibc-rs/issues/604))
 
-### BUG
+### BUG FIXES
 
 - Disallow creation of new Tendermint client state instance with a frozen height
  ([#178](https://github.com/cosmos/ibc-rs/issues/178))
@@ -45,7 +45,7 @@ There are consensus-breaking changes.
   height is updated
   ([#601](https://github.com/cosmos/ibc-rs/issues/601))
 
-### FEATURE
+### FEATURES
 
 - Prefixed denom parity scale codec enabled
   ([#577](https://github.com/cosmos/ibc-rs/pull/577))
diff --git a/crates/ibc/src/clients/ics07_tendermint/error.rs b/crates/ibc/src/clients/ics07_tendermint/error.rs
index c16bcfa74..500d2ff32 100644
--- a/crates/ibc/src/clients/ics07_tendermint/error.rs
+++ b/crates/ibc/src/clients/ics07_tendermint/error.rs
@@ -43,8 +43,8 @@ pub enum Error {
     InvalidRawClientState { reason: String },
     /// missing validator set
     MissingValidatorSet,
-    /// missing trusted validator set
-    MissingTrustedValidatorSet,
+    /// missing trusted next validator set
+    MissingTrustedNextValidatorSet,
     /// missing trusted height
     MissingTrustedHeight,
     /// missing trusting period
diff --git a/crates/ibc/src/clients/ics07_tendermint/header.rs b/crates/ibc/src/clients/ics07_tendermint/header.rs
index c87d4dc95..0c62ec547 100644
--- a/crates/ibc/src/clients/ics07_tendermint/header.rs
+++ b/crates/ibc/src/clients/ics07_tendermint/header.rs
@@ -117,7 +117,7 @@ impl TryFrom<RawHeader> for Header {
                 .ok_or(Error::MissingTrustedHeight)?,
             trusted_next_validator_set: raw
                 .trusted_validators
-                .ok_or(Error::MissingTrustedValidatorSet)?
+                .ok_or(Error::MissingTrustedNextValidatorSet)?
                 .try_into()
                 .map_err(Error::InvalidRawHeader)?,
         };
diff --git a/crates/ibc/src/core/ics02_client/handler/update_client.rs b/crates/ibc/src/core/ics02_client/handler/update_client.rs
index 4b185b009..e2514d064 100644
--- a/crates/ibc/src/core/ics02_client/handler/update_client.rs
+++ b/crates/ibc/src/core/ics02_client/handler/update_client.rs
@@ -22,15 +22,14 @@ where
         signer: _,
     } = msg;
 
-    // Read client type from the host chain store. The client should already exist.
-    // Read client state from the host chain store.
+    // Read client state from the host chain store. The client should already exist.
     let client_state = ctx.client_state(&client_id)?;
 
     client_state.confirm_not_frozen()?;
 
-    client_state
-        .verify_client_message(ctx, &client_id, client_message, &update_kind)
-        .map_err(ContextError::from)
+    client_state.verify_client_message(ctx, &client_id, client_message, &update_kind)?;
+
+    Ok(())
 }
 
 pub(crate) fn execute<Ctx>(ctx: &mut Ctx, msg: MsgUpdateClient) -> Result<(), ContextError>