diff --git a/crates/rpc/ipc/src/stream_codec.rs b/crates/rpc/ipc/src/stream_codec.rs
index b163aa1319..3641aa8daf 100644
--- a/crates/rpc/ipc/src/stream_codec.rs
+++ b/crates/rpc/ipc/src/stream_codec.rs
@@ -110,11 +110,7 @@ impl tokio_util::codec::Decoder for StreamCodec {
                 } else if is_whitespace(byte) {
                     whitespaces += 1;
                 }
-                if byte == b'\\' && !is_escaped && in_str {
-                    is_escaped = true;
-                } else {
-                    is_escaped = false;
-                }
+                is_escaped = byte == b'\\' && !is_escaped && in_str;
 
                 if depth == 0 && idx != start_idx && idx - start_idx + 1 > whitespaces {
                     let bts = buf.split_to(idx + 1);
diff --git a/crates/rpc/rpc-builder/tests/it/utils.rs b/crates/rpc/rpc-builder/tests/it/utils.rs
index 867c4e4b7c..885f989409 100644
--- a/crates/rpc/rpc-builder/tests/it/utils.rs
+++ b/crates/rpc/rpc-builder/tests/it/utils.rs
@@ -104,7 +104,7 @@ pub fn test_rpc_builder() -> RpcModuleBuilder<
     RpcModuleBuilder::default()
         .with_client(NoopProvider::default())
         .with_pool(testing_pool())
-        .with_network(NoopNetwork::default())
+        .with_network(NoopNetwork)
         .with_executor(TokioTaskExecutor::default())
         .with_events(TestCanonStateSubscriptions::default())
 }
diff --git a/crates/rpc/rpc/src/eth/api/server.rs b/crates/rpc/rpc/src/eth/api/server.rs
index dad1060221..7047968866 100644
--- a/crates/rpc/rpc/src/eth/api/server.rs
+++ b/crates/rpc/rpc/src/eth/api/server.rs
@@ -373,7 +373,7 @@ mod tests {
         let eth_api = EthApi::new(
             NoopProvider::default(),
             testing_pool(),
-            NoopNetwork::default(),
+            NoopNetwork,
             EthStateCache::spawn(NoopProvider::default(), Default::default()),
         );
 
@@ -457,7 +457,7 @@ mod tests {
         let eth_api = EthApi::new(
             mock_provider,
             testing_pool(),
-            NoopNetwork::default(),
+            NoopNetwork,
             EthStateCache::spawn(NoopProvider::default(), Default::default()),
         );
 
diff --git a/crates/rpc/rpc/src/eth/api/transactions.rs b/crates/rpc/rpc/src/eth/api/transactions.rs
index 0119ab201d..dc49c9296c 100644
--- a/crates/rpc/rpc/src/eth/api/transactions.rs
+++ b/crates/rpc/rpc/src/eth/api/transactions.rs
@@ -765,7 +765,7 @@ mod tests {
     #[tokio::test]
     async fn send_raw_transaction() {
         let noop_provider = NoopProvider::default();
-        let noop_network_provider = NoopNetwork::default();
+        let noop_network_provider = NoopNetwork;
 
         let pool = testing_pool();
 
diff --git a/crates/transaction-pool/src/test_utils/mod.rs b/crates/transaction-pool/src/test_utils/mod.rs
index 4a0d67534d..a68b9feb25 100644
--- a/crates/transaction-pool/src/test_utils/mod.rs
+++ b/crates/transaction-pool/src/test_utils/mod.rs
@@ -43,6 +43,6 @@ impl<T: PoolTransaction> TransactionValidator for NoopTransactionValidator<T> {
 
 impl<T> Default for NoopTransactionValidator<T> {
     fn default() -> Self {
-        NoopTransactionValidator(PhantomData::default())
+        NoopTransactionValidator(PhantomData)
     }
 }
diff --git a/crates/trie/src/walker.rs b/crates/trie/src/walker.rs
index a8125da1ec..3245ab097d 100644
--- a/crates/trie/src/walker.rs
+++ b/crates/trie/src/walker.rs
@@ -38,7 +38,7 @@ impl<'a, K: Key + From<Vec<u8>>, C: TrieCursor<K>> TrieWalker<'a, K, C> {
             stack: vec![CursorSubNode::default()],
             can_skip_current_node: false,
             trie_updates: None,
-            __phantom: PhantomData::default(),
+            __phantom: PhantomData,
         };
 
         // Set up the root node of the trie in the stack, if it exists.
@@ -59,7 +59,7 @@ impl<'a, K: Key + From<Vec<u8>>, C: TrieCursor<K>> TrieWalker<'a, K, C> {
             stack,
             can_skip_current_node: false,
             trie_updates: None,
-            __phantom: PhantomData::default(),
+            __phantom: PhantomData,
         };
         this.update_skip_node();
         this