diff --git a/crates/types/src/traits/election.rs b/crates/types/src/traits/election.rs
index 81dfd46d57..6ced8bebbc 100644
--- a/crates/types/src/traits/election.rs
+++ b/crates/types/src/traits/election.rs
@@ -91,50 +91,21 @@ pub enum VoteData<COMMITTABLE: Committable + Serialize + Clone> {
     ViewSyncFinalize(Commitment<COMMITTABLE>),
 }
 
-/// Make different types of `VoteData` committable
-impl<COMMITTABLE: Committable + Serialize + Clone> Committable for VoteData<COMMITTABLE> {
-    fn commit(&self) -> Commitment<Self> {
+impl<COMMITTABLE> VoteData<COMMITTABLE>
+where
+    COMMITTABLE: Committable + Serialize + Clone,
+{
+    /// Return the underlying commitment.
+    #[must_use]
+    pub fn get_commit(&self) -> Commitment<COMMITTABLE> {
+        #[allow(clippy::enum_glob_use)]
+        use VoteData::*;
         match self {
-            VoteData::DA(block_commitment) => {
-                commit::RawCommitmentBuilder::new("DA BlockPayload Commit")
-                    .field("block_commitment", *block_commitment)
-                    .finalize()
-            }
-            VoteData::Yes(leaf_commitment) => commit::RawCommitmentBuilder::new("Yes Vote Commit")
-                .field("leaf_commitment", *leaf_commitment)
-                .finalize(),
-            VoteData::No(leaf_commitment) => commit::RawCommitmentBuilder::new("No Vote Commit")
-                .field("leaf_commitment", *leaf_commitment)
-                .finalize(),
-            VoteData::Timeout(view_number_commitment) => {
-                commit::RawCommitmentBuilder::new("Timeout View Number Commit")
-                    .field("view_number_commitment", *view_number_commitment)
-                    .finalize()
-            }
-            VoteData::ViewSyncPreCommit(commitment) => {
-                commit::RawCommitmentBuilder::new("ViewSyncPreCommit")
-                    .field("commitment", *commitment)
-                    .finalize()
-            }
-            VoteData::ViewSyncCommit(commitment) => {
-                commit::RawCommitmentBuilder::new("ViewSyncCommit")
-                    .field("commitment", *commitment)
-                    .finalize()
-            }
-            VoteData::ViewSyncFinalize(commitment) => {
-                commit::RawCommitmentBuilder::new("ViewSyncFinalize")
-                    .field("commitment", *commitment)
-                    .finalize()
-            }
+            DA(c) | Yes(c) | No(c) | Timeout(c) | ViewSyncPreCommit(c) | ViewSyncCommit(c)
+            | ViewSyncFinalize(c) => *c,
         }
     }
 
-    fn tag() -> String {
-        ("VOTE_DATA_COMMIT").to_string()
-    }
-}
-
-impl<COMMITTABLE: Committable + Serialize + Clone> VoteData<COMMITTABLE> {
     #[must_use]
     /// Convert vote data into bytes.
     ///
@@ -367,7 +338,7 @@ pub trait ConsensusExchange<TYPES: NodeType, M: NetworkMsg>: Send + Sync {
 
         match qc.signatures() {
             AssembledSignature::DA(qc) => {
-                let real_commit = VoteData::DA(leaf_commitment).commit();
+                let real_commit = VoteData::DA(leaf_commitment).get_commit();
                 let real_qc_pp = <TYPES::SignatureKey as SignatureKey>::get_public_parameter(
                     self.membership().get_committee_qc_stake_table(),
                     U256::from(self.membership().success_threshold().get()),
@@ -375,7 +346,7 @@ pub trait ConsensusExchange<TYPES: NodeType, M: NetworkMsg>: Send + Sync {
                 <TYPES::SignatureKey as SignatureKey>::check(&real_qc_pp, real_commit.as_ref(), &qc)
             }
             AssembledSignature::Yes(qc) => {
-                let real_commit = VoteData::Yes(leaf_commitment).commit();
+                let real_commit = VoteData::Yes(leaf_commitment).get_commit();
                 let real_qc_pp = <TYPES::SignatureKey as SignatureKey>::get_public_parameter(
                     self.membership().get_committee_qc_stake_table(),
                     U256::from(self.membership().success_threshold().get()),
@@ -383,7 +354,7 @@ pub trait ConsensusExchange<TYPES: NodeType, M: NetworkMsg>: Send + Sync {
                 <TYPES::SignatureKey as SignatureKey>::check(&real_qc_pp, real_commit.as_ref(), &qc)
             }
             AssembledSignature::No(qc) => {
-                let real_commit = VoteData::No(leaf_commitment).commit();
+                let real_commit = VoteData::No(leaf_commitment).get_commit();
                 let real_qc_pp = <TYPES::SignatureKey as SignatureKey>::get_public_parameter(
                     self.membership().get_committee_qc_stake_table(),
                     U256::from(self.membership().success_threshold().get()),
@@ -411,7 +382,7 @@ pub trait ConsensusExchange<TYPES: NodeType, M: NetworkMsg>: Send + Sync {
         let mut is_valid_vote_token = false;
         let mut is_valid_signature = false;
         if let Some(key) = <TYPES::SignatureKey as SignatureKey>::from_bytes(encoded_key) {
-            is_valid_signature = key.validate(encoded_signature, data.commit().as_ref());
+            is_valid_signature = key.validate(encoded_signature, data.get_commit().as_ref());
             let valid_vote_token = self.membership().validate_vote_token(key, vote_token);
             is_valid_vote_token = match valid_vote_token {
                 Err(_) => {
@@ -433,7 +404,7 @@ pub trait ConsensusExchange<TYPES: NodeType, M: NetworkMsg>: Send + Sync {
         data: &VoteData<Self::Commitment>,
         vote_token: &Checked<TYPES::VoteTokenType>,
     ) -> bool {
-        let is_valid_signature = key.validate(encoded_signature, data.commit().as_ref());
+        let is_valid_signature = key.validate(encoded_signature, data.get_commit().as_ref());
         let valid_vote_token = self
             .membership()
             .validate_vote_token(key.clone(), vote_token.clone());
@@ -643,7 +614,7 @@ impl<
         let signature = TYPES::SignatureKey::sign(
             &self.private_key,
             VoteData::<TYPES::BlockType>::DA(block_commitment)
-                .commit()
+                .get_commit()
                 .as_ref(),
         );
         (self.public_key.to_bytes(), signature)
@@ -688,7 +659,7 @@ impl<
         let signature = TYPES::SignatureKey::sign(
             &self.private_key,
             VoteData::<TYPES::BlockType>::DA(block_commitment)
-                .commit()
+                .get_commit()
                 .as_ref(),
         );
         (self.public_key.to_bytes(), signature)
@@ -931,7 +902,7 @@ impl<
     ) -> (EncodedPublicKey, EncodedSignature) {
         let signature = TYPES::SignatureKey::sign(
             &self.private_key,
-            VoteData::<LEAF>::Yes(leaf_commitment).commit().as_ref(),
+            VoteData::<LEAF>::Yes(leaf_commitment).get_commit().as_ref(),
         );
         (self.public_key.to_bytes(), signature)
     }
@@ -947,7 +918,7 @@ impl<
     ) -> (EncodedPublicKey, EncodedSignature) {
         let signature = TYPES::SignatureKey::sign(
             &self.private_key,
-            VoteData::<LEAF>::No(leaf_commitment).commit().as_ref(),
+            VoteData::<LEAF>::No(leaf_commitment).get_commit().as_ref(),
         );
         (self.public_key.to_bytes(), signature)
     }
@@ -963,7 +934,7 @@ impl<
         let signature = TYPES::SignatureKey::sign(
             &self.private_key,
             VoteData::<TYPES::Time>::Timeout(view_number.commit())
-                .commit()
+                .get_commit()
                 .as_ref(),
         );
         (self.public_key.to_bytes(), signature)
@@ -1212,7 +1183,9 @@ impl<
     ) -> (EncodedPublicKey, EncodedSignature) {
         let signature = TYPES::SignatureKey::sign(
             &self.private_key,
-            VoteData::ViewSyncPreCommit(commitment).commit().as_ref(),
+            VoteData::ViewSyncPreCommit(commitment)
+                .get_commit()
+                .as_ref(),
         );
 
         (self.public_key.to_bytes(), signature)
@@ -1253,7 +1226,7 @@ impl<
     ) -> (EncodedPublicKey, EncodedSignature) {
         let signature = TYPES::SignatureKey::sign(
             &self.private_key,
-            VoteData::ViewSyncCommit(commitment).commit().as_ref(),
+            VoteData::ViewSyncCommit(commitment).get_commit().as_ref(),
         );
 
         (self.public_key.to_bytes(), signature)
@@ -1294,7 +1267,7 @@ impl<
     ) -> (EncodedPublicKey, EncodedSignature) {
         let signature = TYPES::SignatureKey::sign(
             &self.private_key,
-            VoteData::ViewSyncFinalize(commitment).commit().as_ref(),
+            VoteData::ViewSyncFinalize(commitment).get_commit().as_ref(),
         );
 
         (self.public_key.to_bytes(), signature)
@@ -1325,7 +1298,7 @@ impl<
         };
         match certificate_internal.signatures {
             AssembledSignature::ViewSyncPreCommit(raw_signatures) => {
-                let real_commit = VoteData::ViewSyncPreCommit(vote_data.commit()).commit();
+                let real_commit = VoteData::ViewSyncPreCommit(vote_data.commit()).get_commit();
                 let real_qc_pp = <TYPES::SignatureKey as SignatureKey>::get_public_parameter(
                     self.membership().get_committee_qc_stake_table(),
                     U256::from(self.membership().failure_threshold().get()),
@@ -1337,7 +1310,7 @@ impl<
                 )
             }
             AssembledSignature::ViewSyncCommit(raw_signatures) => {
-                let real_commit = VoteData::ViewSyncCommit(vote_data.commit()).commit();
+                let real_commit = VoteData::ViewSyncCommit(vote_data.commit()).get_commit();
                 let real_qc_pp = <TYPES::SignatureKey as SignatureKey>::get_public_parameter(
                     self.membership().get_committee_qc_stake_table(),
                     U256::from(self.membership().success_threshold().get()),
@@ -1349,7 +1322,7 @@ impl<
                 )
             }
             AssembledSignature::ViewSyncFinalize(raw_signatures) => {
-                let real_commit = VoteData::ViewSyncFinalize(vote_data.commit()).commit();
+                let real_commit = VoteData::ViewSyncFinalize(vote_data.commit()).get_commit();
                 let real_qc_pp = <TYPES::SignatureKey as SignatureKey>::get_public_parameter(
                     self.membership().get_committee_qc_stake_table(),
                     U256::from(self.membership().success_threshold().get()),