diff --git a/crates/interpreter/src/gas/calc.rs b/crates/interpreter/src/gas/calc.rs
index 1200bf9709..e4d85ae095 100644
--- a/crates/interpreter/src/gas/calc.rs
+++ b/crates/interpreter/src/gas/calc.rs
@@ -176,7 +176,7 @@ pub fn sload_cost<SPEC: Spec>(is_cold: bool) -> u64 {
         }
     } else if SPEC::enabled(ISTANBUL) {
         // EIP-1884: Repricing for trie-size-dependent opcodes
-        800
+        INSTANBUL_SLOAD_GAS
     } else if SPEC::enabled(TANGERINE) {
         // EIP-150: Gas cost changes for IO-heavy operations
         200
@@ -193,47 +193,56 @@ pub fn sstore_cost<SPEC: Spec>(
     gas: u64,
     is_cold: bool,
 ) -> Option<u64> {
-    // TODO untangle this mess and make it more elegant
-    let (gas_sload, gas_sstore_reset) = if SPEC::enabled(BERLIN) {
-        (WARM_STORAGE_READ_COST, SSTORE_RESET - COLD_SLOAD_COST)
-    } else {
-        (sload_cost::<SPEC>(is_cold), SSTORE_RESET)
-    };
+    // EIP-1706 Disable SSTORE with gasleft lower than call stipend
+    if SPEC::enabled(ISTANBUL) && gas <= CALL_STIPEND {
+        return None;
+    }
 
-    // https://eips.ethereum.org/EIPS/eip-2200
-    // It’s a combined version of EIP-1283 and EIP-1706
-    let gas_cost = if SPEC::enabled(ISTANBUL) {
-        // EIP-1706
-        if gas <= CALL_STIPEND {
-            return None;
-        }
+    if SPEC::enabled(BERLIN) {
+        // Berlin specification logic
+        let mut gas_cost = istanbul_sstore_cost::<WARM_STORAGE_READ_COST, WARM_SSTORE_RESET>(
+            original, current, new,
+        );
 
-        // EIP-1283
-        if new == current {
-            gas_sload
-        } else {
-            if original == current {
-                if original == U256::ZERO {
-                    SSTORE_SET
-                } else {
-                    gas_sstore_reset
-                }
-            } else {
-                gas_sload
-            }
+        if is_cold {
+            gas_cost += COLD_SLOAD_COST;
         }
+        Some(gas_cost)
+    } else if SPEC::enabled(ISTANBUL) {
+        // Istanbul logic
+        Some(istanbul_sstore_cost::<INSTANBUL_SLOAD_GAS, SSTORE_RESET>(
+            original, current, new,
+        ))
     } else {
-        if current == U256::ZERO && new != U256::ZERO {
-            SSTORE_SET
-        } else {
-            gas_sstore_reset
-        }
-    };
-    // In EIP-2929 we charge extra if the slot has not been used yet in this transaction
-    if SPEC::enabled(BERLIN) && is_cold {
-        Some(gas_cost + COLD_SLOAD_COST)
+        // Frontier logic
+        Some(frontier_sstore_cost(current, new))
+    }
+}
+
+/// EIP-2200: Structured Definitions for Net Gas Metering
+#[inline(always)]
+fn istanbul_sstore_cost<const SLOAD_GAS: u64, const SSTORE_RESET_GAS: u64>(
+    original: U256,
+    current: U256,
+    new: U256,
+) -> u64 {
+    if new == current {
+        SLOAD_GAS
+    } else if original == current && original == U256::ZERO {
+        SSTORE_SET
+    } else if original == current {
+        SSTORE_RESET_GAS
     } else {
-        Some(gas_cost)
+        SLOAD_GAS
+    }
+}
+
+/// Frontier sstore cost just had two cases set and reset values
+fn frontier_sstore_cost(current: U256, new: U256) -> u64 {
+    if current == U256::ZERO && new != U256::ZERO {
+        SSTORE_SET
+    } else {
+        SSTORE_RESET
     }
 }
 
diff --git a/crates/interpreter/src/gas/constants.rs b/crates/interpreter/src/gas/constants.rs
index b8bd7d0544..ed3c7aa38a 100644
--- a/crates/interpreter/src/gas/constants.rs
+++ b/crates/interpreter/src/gas/constants.rs
@@ -20,6 +20,8 @@ pub const COPY: u64 = 3;
 pub const BLOCKHASH: u64 = 20;
 pub const CODEDEPOSIT: u64 = 200;
 
+/// EIP-1884: Repricing for trie-size-dependent opcodes
+pub const INSTANBUL_SLOAD_GAS: u64 = 800;
 pub const SSTORE_SET: u64 = 20000;
 pub const SSTORE_RESET: u64 = 5000;
 pub const REFUND_SSTORE_CLEARS: i64 = 15000;
@@ -34,6 +36,7 @@ pub const ACCESS_LIST_STORAGE_KEY: u64 = 1900;
 pub const COLD_SLOAD_COST: u64 = 2100;
 pub const COLD_ACCOUNT_ACCESS_COST: u64 = 2600;
 pub const WARM_STORAGE_READ_COST: u64 = 100;
+pub const WARM_SSTORE_RESET: u64 = SSTORE_RESET - COLD_SLOAD_COST;
 
 /// EIP-3860 : Limit and meter initcode
 pub const INITCODE_WORD_COST: u64 = 2;
diff --git a/crates/revm/src/db/states/cache_account.rs b/crates/revm/src/db/states/cache_account.rs
index 126ce2ffe7..bfe326e5e7 100644
--- a/crates/revm/src/db/states/cache_account.rs
+++ b/crates/revm/src/db/states/cache_account.rs
@@ -100,7 +100,7 @@ impl CacheAccount {
 
     /// Fetch account info if it exist.
     pub fn account_info(&self) -> Option<AccountInfo> {
-        self.account.as_ref().map(|a| a.info.clone())
+        self.account.clone().map(|a| a.info)
     }
 
     /// Dissolve account into components.
@@ -282,7 +282,7 @@ impl CacheAccount {
         storage: StorageWithOriginalValues,
     ) -> TransitionAccount {
         let previous_status = self.status;
-        let previous_info = self.account.as_ref().map(|a| a.info.clone());
+        let previous_info = self.account.clone().map(|a| a.info);
         let mut this_storage = self
             .account
             .take()
@@ -303,7 +303,7 @@ impl CacheAccount {
         self.account = Some(changed_account);
 
         TransitionAccount {
-            info: self.account.as_ref().map(|a| a.info.clone()),
+            info: self.account.clone().map(|a| a.info),
             status: self.status,
             previous_info,
             previous_status,
diff --git a/tests b/tests
new file mode 160000
index 0000000000..e89fcb01c7
--- /dev/null
+++ b/tests
@@ -0,0 +1 @@
+Subproject commit e89fcb01c7cff52cf7ac04951742ffe99d60bb6a