diff --git a/starknet/src/authenticators/eth_sig.cairo b/starknet/src/authenticators/eth_sig.cairo
index cb4af620..d1f4f164 100644
--- a/starknet/src/authenticators/eth_sig.cairo
+++ b/starknet/src/authenticators/eth_sig.cairo
@@ -1,5 +1,4 @@
-use starknet::{ContractAddress, EthAddress};
-use starknet::SyscallResult;
+use starknet::{ContractAddress, EthAddress, SyscallResult};
 use sx::types::{Strategy, IndexedStrategy, Choice};
 
 #[starknet::interface]
@@ -48,9 +47,11 @@ mod EthSigAuthenticator {
     use starknet::{ContractAddress, EthAddress, syscalls::call_contract_syscall};
     use core::array::{ArrayTrait, SpanTrait};
     use clone::Clone;
-    use sx::space::space::{ISpaceDispatcher, ISpaceDispatcherTrait};
-    use sx::types::{Strategy, IndexedStrategy, Choice, UserAddress};
-    use sx::utils::{signatures, legacy_hash::LegacyHashEthAddress};
+    use sx::{
+        space::space::{ISpaceDispatcher, ISpaceDispatcherTrait},
+        types::{Strategy, IndexedStrategy, Choice, UserAddress},
+        utils::{signatures, legacy_hash::LegacyHashEthAddress}
+    };
 
     #[storage]
     struct Storage {
diff --git a/starknet/src/authenticators/eth_tx.cairo b/starknet/src/authenticators/eth_tx.cairo
index beb7c552..f1e482ee 100644
--- a/starknet/src/authenticators/eth_tx.cairo
+++ b/starknet/src/authenticators/eth_tx.cairo
@@ -34,16 +34,19 @@ trait IEthTxAuthenticator<TContractState> {
 #[starknet::contract]
 mod EthTxAuthenticator {
     use super::IEthTxAuthenticator;
-    use starknet::{ContractAddress, EthAddress, Felt252TryIntoEthAddress, EthAddressIntoFelt252};
-    use starknet::syscalls::call_contract_syscall;
-    use core::serde::Serde;
-    use core::array::{ArrayTrait, SpanTrait};
+    use starknet::{
+        ContractAddress, EthAddress, Felt252TryIntoEthAddress, EthAddressIntoFelt252,
+        syscalls::call_contract_syscall
+    };
+    use core::{serde::Serde, array::{ArrayTrait, SpanTrait}};
     use traits::{PartialEq, TryInto, Into};
     use option::OptionTrait;
     use zeroable::Zeroable;
-    use sx::space::space::{ISpaceDispatcher, ISpaceDispatcherTrait};
-    use sx::types::{UserAddress, Strategy, IndexedStrategy, Choice};
-    use sx::utils::constants::{PROPOSE_SELECTOR, VOTE_SELECTOR, UPDATE_PROPOSAL_SELECTOR};
+    use sx::{
+        space::space::{ISpaceDispatcher, ISpaceDispatcherTrait},
+        types::{UserAddress, Strategy, IndexedStrategy, Choice},
+        utils::constants::{PROPOSE_SELECTOR, VOTE_SELECTOR, UPDATE_PROPOSAL_SELECTOR}
+    };
 
     #[storage]
     struct Storage {
diff --git a/starknet/src/authenticators/stark_sig.cairo b/starknet/src/authenticators/stark_sig.cairo
index b2a59e43..25edd142 100644
--- a/starknet/src/authenticators/stark_sig.cairo
+++ b/starknet/src/authenticators/stark_sig.cairo
@@ -44,9 +44,10 @@ mod StarkSigAuthenticator {
     use starknet::{ContractAddress, info};
     use core::array::{ArrayTrait, SpanTrait};
     use serde::Serde;
-    use sx::space::space::{ISpaceDispatcher, ISpaceDispatcherTrait};
-    use sx::types::{Strategy, IndexedStrategy, UserAddress, Choice};
-    use sx::utils::stark_eip712;
+    use sx::{
+        space::space::{ISpaceDispatcher, ISpaceDispatcherTrait},
+        types::{Strategy, IndexedStrategy, UserAddress, Choice}, utils::stark_eip712
+    };
 
     #[storage]
     struct Storage {
diff --git a/starknet/src/authenticators/stark_tx.cairo b/starknet/src/authenticators/stark_tx.cairo
index 3f8f88a8..920f2c00 100644
--- a/starknet/src/authenticators/stark_tx.cairo
+++ b/starknet/src/authenticators/stark_tx.cairo
@@ -35,8 +35,10 @@ mod StarkTxAuthenticator {
     use super::IStarkTxAuthenticator;
     use starknet::{ContractAddress, info};
     use core::array::ArrayTrait;
-    use sx::space::space::{ISpaceDispatcher, ISpaceDispatcherTrait};
-    use sx::types::{UserAddress, Strategy, IndexedStrategy, Choice};
+    use sx::{
+        space::space::{ISpaceDispatcher, ISpaceDispatcherTrait},
+        types::{UserAddress, Strategy, IndexedStrategy, Choice},
+    };
 
     #[storage]
     struct Storage {}
diff --git a/starknet/src/authenticators/vanilla.cairo b/starknet/src/authenticators/vanilla.cairo
index deb22ef0..c2140c40 100644
--- a/starknet/src/authenticators/vanilla.cairo
+++ b/starknet/src/authenticators/vanilla.cairo
@@ -1,5 +1,4 @@
-use starknet::ContractAddress;
-use starknet::SyscallResult;
+use starknet::{ContractAddress, SyscallResult};
 
 #[starknet::interface]
 trait IVanillaAuthenticator<TContractState> {
diff --git a/starknet/src/execution_strategies/eth_relayer.cairo b/starknet/src/execution_strategies/eth_relayer.cairo
index ccf5344a..42d570ce 100644
--- a/starknet/src/execution_strategies/eth_relayer.cairo
+++ b/starknet/src/execution_strategies/eth_relayer.cairo
@@ -1,9 +1,7 @@
 #[starknet::contract]
 mod EthRelayerExecutionStrategy {
-    use starknet::syscalls::send_message_to_l1_syscall;
-    use starknet::info::get_caller_address;
-    use sx::interfaces::IExecutionStrategy;
-    use sx::types::{Proposal};
+    use starknet::{syscalls::send_message_to_l1_syscall, info::get_caller_address};
+    use sx::{interfaces::IExecutionStrategy, types::Proposal};
 
     #[external(v0)]
     impl EthRelayerExecutionStrategy of IExecutionStrategy<ContractState> {
diff --git a/starknet/src/external/ownable.cairo b/starknet/src/external/ownable.cairo
index 3de6e542..9256d651 100644
--- a/starknet/src/external/ownable.cairo
+++ b/starknet/src/external/ownable.cairo
@@ -2,8 +2,7 @@
 // Migrated lib to v2
 #[starknet::contract]
 mod Ownable {
-    use starknet::ContractAddress;
-    use starknet::get_caller_address;
+    use starknet::{ContractAddress, get_caller_address};
     use zeroable::Zeroable;
 
     #[storage]
diff --git a/starknet/src/factory/factory.cairo b/starknet/src/factory/factory.cairo
index 855327aa..6bf12f1c 100644
--- a/starknet/src/factory/factory.cairo
+++ b/starknet/src/factory/factory.cairo
@@ -1,5 +1,4 @@
-use starknet::ContractAddress;
-use starknet::ClassHash;
+use starknet::{ContractAddress, ClassHash};
 
 #[starknet::interface]
 trait IFactory<TContractState> {
@@ -15,10 +14,10 @@ trait IFactory<TContractState> {
 #[starknet::contract]
 mod Factory {
     use super::IFactory;
-    use starknet::ContractAddress;
-    use starknet::contract_address_const;
-    use starknet::syscalls::{deploy_syscall, call_contract_syscall};
-    use starknet::ClassHash;
+    use starknet::{
+        ContractAddress, ClassHash, contract_address_const,
+        syscalls::{deploy_syscall, call_contract_syscall}
+    };
     use result::ResultTrait;
     use array::{ArrayTrait, SpanTrait};
     use sx::utils::constants::INITIALIZE_SELECTOR;
diff --git a/starknet/src/interfaces/i_account.cairo b/starknet/src/interfaces/i_account.cairo
index 21b94f82..672a2536 100644
--- a/starknet/src/interfaces/i_account.cairo
+++ b/starknet/src/interfaces/i_account.cairo
@@ -1,5 +1,4 @@
-use array::ArrayTrait;
-use array::SpanTrait;
+use array::{ArrayTrait, SpanTrait};
 use starknet::account::Call;
 use starknet::ContractAddress;
 
diff --git a/starknet/src/proposal_validation_strategies/proposing_power.cairo b/starknet/src/proposal_validation_strategies/proposing_power.cairo
index cdbff952..fab93e41 100644
--- a/starknet/src/proposal_validation_strategies/proposing_power.cairo
+++ b/starknet/src/proposal_validation_strategies/proposing_power.cairo
@@ -1,19 +1,20 @@
 #[starknet::contract]
 mod ProposingPowerProposalValidationStrategy {
-    use sx::interfaces::IProposalValidationStrategy;
-    use sx::types::{UserAddress, IndexedStrategy, IndexedStrategyTrait, Strategy};
-    use sx::interfaces::{IVotingStrategyDispatcher, IVotingStrategyDispatcherTrait};
-    use starknet::ContractAddress;
-    use starknet::info;
+    use sx::{
+        interfaces::{
+            IProposalValidationStrategy, IVotingStrategyDispatcher, IVotingStrategyDispatcherTrait
+        },
+        types::{UserAddress, IndexedStrategy, IndexedStrategyTrait, Strategy},
+        utils::{bits::BitSetter, proposition_power::_validate}
+    };
+    use starknet::{ContractAddress, info};
     use traits::{Into, TryInto};
     use option::OptionTrait;
     use result::ResultTrait;
     use array::{ArrayTrait, SpanTrait};
     use serde::Serde;
-    use sx::utils::bits::BitSetter;
     use box::BoxTrait;
     use clone::Clone;
-    use sx::utils::proposition_power::_validate;
 
     #[storage]
     struct Storage {}
diff --git a/starknet/src/space/space.cairo b/starknet/src/space/space.cairo
index 0e9ee514..7a9a6b3a 100644
--- a/starknet/src/space/space.cairo
+++ b/starknet/src/space/space.cairo
@@ -75,31 +75,33 @@ trait ISpace<TContractState> {
 #[starknet::contract]
 mod Space {
     use super::ISpace;
-    use starknet::storage_access::{StorePacking, StoreUsingPacking};
-    use starknet::{ClassHash, ContractAddress, info, Store, syscalls};
+    use starknet::{
+        storage_access::{StorePacking, StoreUsingPacking}, ClassHash, ContractAddress, info, Store,
+        syscalls
+    };
     use zeroable::Zeroable;
     use array::{ArrayTrait, SpanTrait};
     use clone::Clone;
     use option::OptionTrait;
     use hash::LegacyHash;
     use traits::{Into, TryInto};
-
-    use sx::interfaces::{
-        IProposalValidationStrategyDispatcher, IProposalValidationStrategyDispatcherTrait,
-        IVotingStrategyDispatcher, IVotingStrategyDispatcherTrait, IExecutionStrategyDispatcher,
-        IExecutionStrategyDispatcherTrait
-    };
-    use sx::types::{
-        UserAddress, Choice, FinalizationStatus, Strategy, IndexedStrategy, Proposal,
-        PackedProposal, IndexedStrategyTrait, IndexedStrategyImpl, UpdateSettingsCalldata,
-        NoUpdateU32, NoUpdateStrategy, NoUpdateArray
+    use sx::{
+        interfaces::{
+            IProposalValidationStrategyDispatcher, IProposalValidationStrategyDispatcherTrait,
+            IVotingStrategyDispatcher, IVotingStrategyDispatcherTrait, IExecutionStrategyDispatcher,
+            IExecutionStrategyDispatcherTrait
+        },
+        types::{
+            UserAddress, Choice, FinalizationStatus, Strategy, IndexedStrategy, Proposal,
+            PackedProposal, IndexedStrategyTrait, IndexedStrategyImpl, UpdateSettingsCalldata,
+            NoUpdateU32, NoUpdateStrategy, NoUpdateArray
+        },
+        utils::{
+            reinitializable::{Reinitializable}, ReinitializableImpl, bits::BitSetter,
+            legacy_hash::LegacyHashChoice, constants::INITIALIZE_SELECTOR
+        },
+        external::ownable::Ownable
     };
-    use sx::utils::reinitializable::Reinitializable;
-    use sx::utils::ReinitializableImpl;
-    use sx::utils::bits::BitSetter;
-    use sx::utils::legacy_hash::LegacyHashChoice;
-    use sx::external::ownable::Ownable;
-    use sx::utils::constants::INITIALIZE_SELECTOR;
 
     #[storage]
     struct Storage {
diff --git a/starknet/src/types/proposal.cairo b/starknet/src/types/proposal.cairo
index d6ce917c..6e22575d 100644
--- a/starknet/src/types/proposal.cairo
+++ b/starknet/src/types/proposal.cairo
@@ -1,12 +1,10 @@
-use sx::types::user_address::UserAddressTrait;
 use clone::Clone;
 use serde::Serde;
-use starknet::ContractAddress;
-use starknet::storage_access::StorePacking;
-use starknet::Store;
-use sx::utils::math::pow;
+use starknet::{ContractAddress, storage_access::StorePacking, Store};
+use sx::{
+    utils::math::pow, types::{FinalizationStatus, UserAddress, user_address::UserAddressTrait}
+};
 use traits::{Into, TryInto};
-use sx::types::{FinalizationStatus, UserAddress};
 use option::OptionTrait;
 use debug::PrintTrait;
 
diff --git a/starknet/src/utils/merkle.cairo b/starknet/src/utils/merkle.cairo
index 1f044389..a5d9cd26 100644
--- a/starknet/src/utils/merkle.cairo
+++ b/starknet/src/utils/merkle.cairo
@@ -2,10 +2,9 @@ use core::traits::Into;
 use array::{ArrayTrait, Span, SpanTrait};
 use option::OptionTrait;
 use serde::Serde;
-use sx::types::UserAddress;
 use clone::Clone;
 use hash::{LegacyHash};
-use sx::utils::legacy_hash::LegacyHashSpanFelt252;
+use sx::{types::UserAddress, utils::legacy_hash::LegacyHashSpanFelt252};
 
 /// Leaf struct for the merkle tree
 #[derive(Copy, Clone, Drop, Serde)]
diff --git a/starknet/src/utils/proposition_power.cairo b/starknet/src/utils/proposition_power.cairo
index e7361d4d..bf4afab5 100644
--- a/starknet/src/utils/proposition_power.cairo
+++ b/starknet/src/utils/proposition_power.cairo
@@ -1,14 +1,15 @@
-use sx::interfaces::IProposalValidationStrategy;
-use sx::types::{UserAddress, IndexedStrategy, IndexedStrategyTrait, Strategy};
-use sx::interfaces::{IVotingStrategyDispatcher, IVotingStrategyDispatcherTrait};
-use starknet::ContractAddress;
-use starknet::info;
+use sx::{
+    interfaces::{
+        IProposalValidationStrategy, IVotingStrategyDispatcher, IVotingStrategyDispatcherTrait
+    },
+    types::{UserAddress, IndexedStrategy, IndexedStrategyTrait, Strategy}, utils::bits::BitSetter
+};
+use starknet::{ContractAddress, info};
 use traits::{Into, TryInto};
 use option::OptionTrait;
 use result::ResultTrait;
 use array::{ArrayTrait, SpanTrait};
 use serde::Serde;
-use sx::utils::bits::BitSetter;
 use box::BoxTrait;
 use clone::Clone;
 
diff --git a/starknet/src/utils/reinitializable.cairo b/starknet/src/utils/reinitializable.cairo
index d044d172..2f137217 100644
--- a/starknet/src/utils/reinitializable.cairo
+++ b/starknet/src/utils/reinitializable.cairo
@@ -9,8 +9,7 @@ trait IReinitializable<TContractState> {
 #[starknet::contract]
 mod Reinitializable {
     use super::IReinitializable;
-    use starknet::ContractAddress;
-    use starknet::syscalls::call_contract_syscall;
+    use starknet::{ContractAddress, syscalls::call_contract_syscall};
     use core::array::{ArrayTrait, SpanTrait};
 
     #[storage]
diff --git a/starknet/src/utils/signatures.cairo b/starknet/src/utils/signatures.cairo
index 80d63db9..320ad323 100644
--- a/starknet/src/utils/signatures.cairo
+++ b/starknet/src/utils/signatures.cairo
@@ -4,14 +4,17 @@ use traits::Into;
 use clone::Clone;
 use core::keccak;
 use integer::u256_from_felt252;
-use sx::types::{Strategy, IndexedStrategy, Choice};
-use sx::utils::Felt252ArrayIntoU256Array;
-use sx::utils::math::pow;
-use sx::utils::constants::{
-    DOMAIN_TYPEHASH_LOW, DOMAIN_TYPEHASH_HIGH, ETHEREUM_PREFIX, STRATEGY_TYPEHASH_LOW,
-    STRATEGY_TYPEHASH_HIGH, INDEXED_STRATEGY_TYPEHASH_LOW, INDEXED_STRATEGY_TYPEHASH_HIGH,
-    PROPOSE_TYPEHASH_LOW, PROPOSE_TYPEHASH_HIGH, VOTE_TYPEHASH_LOW, VOTE_TYPEHASH_HIGH,
-    UPDATE_PROPOSAL_TYPEHASH_LOW, UPDATE_PROPOSAL_TYPEHASH_HIGH
+use sx::{
+    types::{Strategy, IndexedStrategy, Choice},
+    utils::{
+        Felt252ArrayIntoU256Array, math::pow,
+        constants::{
+            DOMAIN_TYPEHASH_LOW, DOMAIN_TYPEHASH_HIGH, ETHEREUM_PREFIX, STRATEGY_TYPEHASH_LOW,
+            STRATEGY_TYPEHASH_HIGH, INDEXED_STRATEGY_TYPEHASH_LOW, INDEXED_STRATEGY_TYPEHASH_HIGH,
+            PROPOSE_TYPEHASH_LOW, PROPOSE_TYPEHASH_HIGH, VOTE_TYPEHASH_LOW, VOTE_TYPEHASH_HIGH,
+            UPDATE_PROPOSAL_TYPEHASH_LOW, UPDATE_PROPOSAL_TYPEHASH_HIGH
+        }
+    }
 };
 
 impl ContractAddressIntoU256 of Into<ContractAddress, u256> {
diff --git a/starknet/src/utils/single_slot_proof.cairo b/starknet/src/utils/single_slot_proof.cairo
index e152e64e..1499d30f 100644
--- a/starknet/src/utils/single_slot_proof.cairo
+++ b/starknet/src/utils/single_slot_proof.cairo
@@ -1,6 +1,3 @@
-use core::zeroable::Zeroable;
-use array::ArrayTrait;
-
 // Each word is 64 bits
 #[derive(Serde, Option, Drop)]
 struct StorageSlot {
diff --git a/starknet/src/utils/stark_eip712.cairo b/starknet/src/utils/stark_eip712.cairo
index 97a8446c..00d77e0a 100644
--- a/starknet/src/utils/stark_eip712.cairo
+++ b/starknet/src/utils/stark_eip712.cairo
@@ -4,18 +4,20 @@ use array::{ArrayTrait, SpanTrait};
 use traits::Into;
 use box::BoxTrait;
 use serde::Serde;
-use sx::types::{Strategy, IndexedStrategy, Choice};
-use sx::utils::{
-    struct_hash::StructHash,
-    constants::{
-        STARKNET_MESSAGE, DOMAIN_TYPEHASH, PROPOSE_TYPEHASH, VOTE_TYPEHASH,
-        UPDATE_PROPOSAL_TYPEHASH, ERC165_ACCOUNT_INTERFACE_ID, ERC165_OLD_ACCOUNT_INTERFACE_ID
+use sx::{
+    types::{Strategy, IndexedStrategy, Choice},
+    utils::{
+        struct_hash::StructHash,
+        constants::{
+            STARKNET_MESSAGE, DOMAIN_TYPEHASH, PROPOSE_TYPEHASH, VOTE_TYPEHASH,
+            UPDATE_PROPOSAL_TYPEHASH, ERC165_ACCOUNT_INTERFACE_ID, ERC165_OLD_ACCOUNT_INTERFACE_ID
+        }
+    },
+    interfaces::{
+        AccountABIDispatcher, AccountABIDispatcherTrait, AccountCamelABIDispatcher,
+        AccountCamelABIDispatcherTrait
     }
 };
-use sx::interfaces::{
-    AccountABIDispatcher, AccountABIDispatcherTrait, AccountCamelABIDispatcher,
-    AccountCamelABIDispatcherTrait
-};
 
 fn verify_propose_sig(
     domain_hash: felt252,
diff --git a/starknet/src/utils/struct_hash.cairo b/starknet/src/utils/struct_hash.cairo
index bcbabbeb..adb7e9d9 100644
--- a/starknet/src/utils/struct_hash.cairo
+++ b/starknet/src/utils/struct_hash.cairo
@@ -1,14 +1,16 @@
 use array::{ArrayTrait, SpanTrait};
 use hash::LegacyHash;
 use serde::Serde;
-use sx::types::{Strategy, IndexedStrategy};
-use sx::utils::{
-    constants::{
-        STARKNET_MESSAGE, DOMAIN_TYPEHASH, STRATEGY_TYPEHASH, INDEXED_STRATEGY_TYPEHASH,
-        U256_TYPEHASH, PROPOSE_TYPEHASH, VOTE_TYPEHASH, UPDATE_PROPOSAL_TYPEHASH
+use sx::{
+    types::{Strategy, IndexedStrategy},
+    utils::{
+        constants::{
+            STARKNET_MESSAGE, DOMAIN_TYPEHASH, STRATEGY_TYPEHASH, INDEXED_STRATEGY_TYPEHASH,
+            U256_TYPEHASH, PROPOSE_TYPEHASH, VOTE_TYPEHASH, UPDATE_PROPOSAL_TYPEHASH
+        },
+        legacy_hash::LegacyHashSpanFelt252,
     }
 };
-use sx::utils::legacy_hash::LegacyHashSpanFelt252;
 
 trait StructHash<T> {
     fn struct_hash(self: @T) -> felt252;
diff --git a/starknet/src/voting_strategies/eth_balance_of.cairo b/starknet/src/voting_strategies/eth_balance_of.cairo
index a8138e8d..2f534072 100644
--- a/starknet/src/voting_strategies/eth_balance_of.cairo
+++ b/starknet/src/voting_strategies/eth_balance_of.cairo
@@ -2,9 +2,10 @@
 mod EthBalanceOfVotingStrategy {
     use traits::Into;
     use starknet::{EthAddress, ContractAddress};
-    use sx::interfaces::IVotingStrategy;
-    use sx::types::{UserAddress, UserAddressTrait};
-    use sx::utils::single_slot_proof::SingleSlotProof;
+    use sx::{
+        interfaces::IVotingStrategy, types::{UserAddress, UserAddressTrait},
+        utils::single_slot_proof::SingleSlotProof
+    };
 
     #[storage]
     struct Storage {}
diff --git a/starknet/src/voting_strategies/merkle_whitelist.cairo b/starknet/src/voting_strategies/merkle_whitelist.cairo
index 182608e7..1cef108a 100644
--- a/starknet/src/voting_strategies/merkle_whitelist.cairo
+++ b/starknet/src/voting_strategies/merkle_whitelist.cairo
@@ -1,11 +1,11 @@
 #[starknet::contract]
 mod MerkleWhitelistVotingStrategy {
-    use sx::interfaces::IVotingStrategy;
+    use sx::{
+        interfaces::IVotingStrategy, types::UserAddress, utils::merkle::{assert_valid_proof, Leaf}
+    };
     use serde::Serde;
-    use sx::types::UserAddress;
     use array::{ArrayTrait, Span, SpanTrait};
     use option::OptionTrait;
-    use sx::utils::merkle::{assert_valid_proof, Leaf};
 
     const LEAF_SIZE: usize = 4; // Serde::<Leaf>::serialize().len()
 
diff --git a/starknet/src/voting_strategies/vanilla.cairo b/starknet/src/voting_strategies/vanilla.cairo
index 0e880acf..038912c6 100644
--- a/starknet/src/voting_strategies/vanilla.cairo
+++ b/starknet/src/voting_strategies/vanilla.cairo
@@ -1,7 +1,6 @@
 #[starknet::contract]
 mod VanillaVotingStrategy {
-    use sx::interfaces::IVotingStrategy;
-    use sx::types::UserAddress;
+    use sx::{interfaces::IVotingStrategy, types::UserAddress};
     use starknet::ContractAddress;
 
     #[storage]