diff --git a/src/data/data_store.cairo b/src/data/data_store.cairo
index 15e4f77c..3e8949b9 100644
--- a/src/data/data_store.cairo
+++ b/src/data/data_store.cairo
@@ -356,7 +356,7 @@ trait IDataStore<TContractState> {
 
 
     /// Returns the number of withdrawals
-    fn get_withdrawal_count(self: @TContractState) ->u32;
+    fn get_withdrawal_count(self: @TContractState) -> u32;
 
     /// Returns the number of withdrawals made by a specific account.
     ///
diff --git a/src/market/market_utils.cairo b/src/market/market_utils.cairo
index 09a8f34b..9161c21a 100644
--- a/src/market/market_utils.cairo
+++ b/src/market/market_utils.cairo
@@ -1492,10 +1492,9 @@ fn validate_reserve(
     let max_reserved_usd = apply_factor_u256(pool_usd, reserve_factor);
 
     let reserved_usd = get_reserved_usd(data_store, market, prices, is_long);
-
-    // if (reserved_usd > max_reserved_usd) {
-    //     MarketError::INSUFFICIENT_RESERVE(reserved_usd, max_reserved_usd);
-    // }
+// if (reserved_usd > max_reserved_usd) {
+//     MarketError::INSUFFICIENT_RESERVE(reserved_usd, max_reserved_usd);
+// }
 }
 
 
@@ -1657,10 +1656,9 @@ fn validate_open_interest_reserve(
     let max_reserved_usd: u256 = apply_factor_u256(pool_usd, reserve_factor);
 
     let reserved_usd: u256 = get_reserved_usd(data_store, market, prices, is_long);
-
-    // if (reserved_usd > max_reserved_usd) {
-    //     MarketError::INSUFFICIENT_RESERVE(reserved_usd, max_reserved_usd);
-    // }
+// if (reserved_usd > max_reserved_usd) {
+//     MarketError::INSUFFICIENT_RESERVE(reserved_usd, max_reserved_usd);
+// }
 }
 
 // @notice Get the next borrowing fees for a position.
diff --git a/src/router/exchange_router.cairo b/src/router/exchange_router.cairo
index 0d570e86..d0e3cedf 100644
--- a/src/router/exchange_router.cairo
+++ b/src/router/exchange_router.cairo
@@ -311,8 +311,7 @@ mod ExchangeRouter {
             }
 
             self.deposit_handler.read().cancel_deposit(key);
-
-            // global_reentrancy_guard::non_reentrant_after(data_store);
+        // global_reentrancy_guard::non_reentrant_after(data_store);
         }
 
         fn create_withdrawal(ref self: ContractState, params: CreateWithdrawalParams) -> felt252 {
@@ -339,8 +338,7 @@ mod ExchangeRouter {
             }
 
             self.withdrawal_handler.read().cancel_withdrawal(key);
-
-            // global_reentrancy_guard::non_reentrant_after(data_store);
+        // global_reentrancy_guard::non_reentrant_after(data_store);
         }
 
         fn create_order(ref self: ContractState, params: CreateOrderParams) -> felt252 {
@@ -365,8 +363,7 @@ mod ExchangeRouter {
             callback_utils::set_saved_callback_contract(
                 data_store, get_caller_address(), market, callback_contract
             );
-
-            // global_reentrancy_guard::non_reentrant_after(data_store);
+        // global_reentrancy_guard::non_reentrant_after(data_store);
         }
 
         fn simulate_execute_deposit(
@@ -376,8 +373,7 @@ mod ExchangeRouter {
             // global_reentrancy_guard::non_reentrant_before(data_store);
 
             self.deposit_handler.read().simulate_execute_deposit(key, simulated_oracle_params);
-
-            // global_reentrancy_guard::non_reentrant_after(data_store);
+        // global_reentrancy_guard::non_reentrant_after(data_store);
         }
 
         fn simulate_execute_withdrawal(
@@ -390,8 +386,7 @@ mod ExchangeRouter {
                 .withdrawal_handler
                 .read()
                 .simulate_execute_withdrawal(key, simulated_oracle_params);
-
-            // global_reentrancy_guard::non_reentrant_after(data_store);
+        // global_reentrancy_guard::non_reentrant_after(data_store);
         }
 
         fn simulate_execute_order(
@@ -401,8 +396,7 @@ mod ExchangeRouter {
             // global_reentrancy_guard::non_reentrant_before(data_store);
 
             self.order_handler.read().simulate_execute_order(key, simulated_oracle_params);
-
-            // global_reentrancy_guard::non_reentrant_after(data_store);
+        // global_reentrancy_guard::non_reentrant_after(data_store);
         }
 
         // fn update_order(
@@ -414,7 +408,7 @@ mod ExchangeRouter {
         //     min_output_amout: u256
         // ) {
         //     let data_store = self.data_store.read();
-            // global_reentrancy_guard::non_reentrant_before(data_store);
+        // global_reentrancy_guard::non_reentrant_before(data_store);
 
         //     let order = data_store.get_order(key);
 
@@ -433,7 +427,7 @@ mod ExchangeRouter {
 
         // fn cancel_order(ref self: ContractState, key: felt252) {
         //     let data_store = self.data_store.read();
-            // global_reentrancy_guard::non_reentrant_before(data_store);
+        // global_reentrancy_guard::non_reentrant_before(data_store);
 
         //     let order = data_store.get_order(key);
 
@@ -597,8 +591,7 @@ mod ExchangeRouter {
             market_utils::set_ui_fee_factor(
                 data_store, self.event_emitter.read(), account, ui_fee_factor
             );
-
-            // global_reentrancy_guard::non_reentrant_after(data_store);
+        // global_reentrancy_guard::non_reentrant_after(data_store);
         }
 
         fn claim_ui_fees(