diff --git a/Scarb.toml b/Scarb.toml
index 7e6b46f..ec20136 100644
--- a/Scarb.toml
+++ b/Scarb.toml
@@ -4,9 +4,16 @@ version = "0.1.0"
 description = "Contracts for governance of Starknet-native protocols"
 homepage = "https://ekubo.org"
 cairo-version = "2.4.3"
+edition = '2023_10'
+
+
 
 [dependencies]
 starknet = "=2.4.3"
 
 [[target.starknet-contract]]
 allowed-libfuncs-list.name = "audited"
+casm = true
+
+[tool.fmt]
+sort-module-level-items = true
diff --git a/src/airdrop.cairo b/src/airdrop.cairo
index dfcc58c..51f58fb 100644
--- a/src/airdrop.cairo
+++ b/src/airdrop.cairo
@@ -1,6 +1,6 @@
+use core::array::{Array};
 use governance::interfaces::erc20::{IERC20Dispatcher};
 use starknet::{ContractAddress};
-use array::{Array};
 
 #[derive(Copy, Drop, Serde, Hash, PartialEq)]
 struct Claim {
@@ -25,11 +25,11 @@ trait IAirdrop<TStorage> {
 
 #[starknet::contract]
 mod Airdrop {
-    use super::{IAirdrop, ContractAddress, Claim, IERC20Dispatcher};
+    use core::array::{ArrayTrait, SpanTrait};
+    use core::hash::{LegacyHash};
     use governance::interfaces::erc20::{IERC20DispatcherTrait};
-    use hash::{LegacyHash};
-    use array::{ArrayTrait, SpanTrait};
     use starknet::{ContractAddressIntoFelt252};
+    use super::{IAirdrop, ContractAddress, Claim, IERC20Dispatcher};
 
     fn lt<X, +Copy<X>, +Into<X, u256>>(lhs: @X, rhs: @X) -> bool {
         let a: u256 = (*lhs).into();
@@ -43,9 +43,9 @@ mod Airdrop {
             Option::Some(proof_element) => {
                 compute_pedersen_root(
                     if lt(@current, proof_element) {
-                        pedersen::pedersen(current, *proof_element)
+                        core::pedersen::pedersen(current, *proof_element)
                     } else {
-                        pedersen::pedersen(*proof_element, current)
+                        core::pedersen::pedersen(*proof_element, current)
                     },
                     proof
                 )
diff --git a/src/airdrop_test.cairo b/src/airdrop_test.cairo
index 14e1b98..7d76eca 100644
--- a/src/airdrop_test.cairo
+++ b/src/airdrop_test.cairo
@@ -1,24 +1,23 @@
-use governance::governance_token::{
-    IGovernanceTokenDispatcherTrait, GovernanceToken, IGovernanceTokenDispatcher
-};
-use array::{ArrayTrait};
-use debug::PrintTrait;
+use core::array::{ArrayTrait};
+use core::hash::{LegacyHash};
+use core::option::{OptionTrait};
+
+use core::result::{Result, ResultTrait};
+use core::traits::{TryInto, Into};
 use governance::airdrop::{
     IAirdropDispatcher, IAirdropDispatcherTrait, Airdrop, Airdrop::compute_pedersen_root, Claim,
     Airdrop::lt
 };
-use hash::{LegacyHash};
+use governance::governance_token::{
+    IGovernanceTokenDispatcherTrait, GovernanceToken, IGovernanceTokenDispatcher
+};
+use governance::governance_token_test::{deploy as deploy_token};
 use governance::interfaces::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
+use starknet::class_hash::Felt252TryIntoClassHash;
+use starknet::testing::{pop_log};
 use starknet::{
     get_contract_address, deploy_syscall, ClassHash, contract_address_const, ContractAddress
 };
-use starknet::testing::{pop_log};
-use governance::governance_token_test::{deploy as deploy_token};
-use starknet::class_hash::Felt252TryIntoClassHash;
-use traits::{TryInto, Into};
-
-use result::{Result, ResultTrait};
-use option::{OptionTrait};
 
 fn deploy(token: ContractAddress, root: felt252) -> IAirdropDispatcher {
     let mut constructor_args: Array<felt252> = ArrayTrait::new();
@@ -189,9 +188,9 @@ fn test_claim_two_claims() {
     let leaf_b = LegacyHash::hash(0, claim_b);
 
     let root = if lt(@leaf_a, @leaf_b) {
-        pedersen::pedersen(leaf_a, leaf_b)
+        core::pedersen::pedersen(leaf_a, leaf_b)
     } else {
-        pedersen::pedersen(leaf_b, leaf_a)
+        core::pedersen::pedersen(leaf_b, leaf_a)
     };
 
     let airdrop = deploy(token.contract_address, root);
diff --git a/src/call_trait.cairo b/src/call_trait.cairo
index 308ae32..852e221 100644
--- a/src/call_trait.cairo
+++ b/src/call_trait.cairo
@@ -1,12 +1,12 @@
+use core::array::{ArrayTrait, SpanTrait};
+use core::hash::{LegacyHash, HashStateTrait, Hash};
+use core::result::{ResultTrait};
+use core::traits::{Into};
+use starknet::account::{Call};
 use starknet::{ContractAddress, ContractAddressIntoFelt252};
-use array::{ArrayTrait, SpanTrait};
-use traits::{Into};
-use hash::{LegacyHash};
 use starknet::{SyscallResult, syscalls::call_contract_syscall};
-use starknet::account::{Call};
-use result::{ResultTrait};
 
-impl HashCall<S, +hash::HashStateTrait<S>, +Drop<S>, +Copy<S>> of hash::Hash<@Call, S> {
+impl HashCall<S, +HashStateTrait<S>, +Drop<S>, +Copy<S>> of Hash<@Call, S> {
     fn update_state(state: S, value: @Call) -> S {
         let mut s = state.update((*value.to).into()).update(*value.selector);
 
diff --git a/src/call_trait_test.cairo b/src/call_trait_test.cairo
index 76bbd9b..f4919f8 100644
--- a/src/call_trait_test.cairo
+++ b/src/call_trait_test.cairo
@@ -1,10 +1,9 @@
-use debug::PrintTrait;
+use core::array::{Array, ArrayTrait};
+use core::hash::{LegacyHash};
+use core::serde::{Serde};
 use governance::call_trait::{CallTrait, HashCall};
-use starknet::{contract_address_const, account::{Call}};
-use array::{Array, ArrayTrait};
 use governance::governance_token_test::{deploy as deploy_token};
-use serde::{Serde};
-use hash::{LegacyHash};
+use starknet::{contract_address_const, account::{Call}};
 
 #[test]
 #[available_gas(300000000)]
diff --git a/src/factory.cairo b/src/factory.cairo
index e90a44c..5c5e2ce 100644
--- a/src/factory.cairo
+++ b/src/factory.cairo
@@ -1,9 +1,9 @@
-use starknet::{ContractAddress};
+use governance::airdrop::{IAirdropDispatcher};
+use governance::governance_token::{IGovernanceTokenDispatcher};
 use governance::governor::{Config as GovernorConfig};
 use governance::governor::{IGovernorDispatcher};
-use governance::governance_token::{IGovernanceTokenDispatcher};
-use governance::airdrop::{IAirdropDispatcher};
 use governance::timelock::{ITimelockDispatcher};
+use starknet::{ContractAddress};
 
 #[derive(Copy, Drop, Serde)]
 struct AirdropConfig {
@@ -43,13 +43,13 @@ trait IFactory<TContractState> {
 
 #[starknet::contract]
 mod Factory {
+    use core::result::{ResultTrait};
+    use governance::interfaces::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
+    use starknet::{ClassHash, deploy_syscall, get_caller_address};
     use super::{
         IFactory, DeploymentParameters, DeploymentResult, ContractAddress,
         IGovernanceTokenDispatcher, IAirdropDispatcher, IGovernorDispatcher, ITimelockDispatcher
     };
-    use core::result::{ResultTrait};
-    use starknet::{ClassHash, deploy_syscall, get_caller_address};
-    use governance::interfaces::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
 
     #[storage]
     struct Storage {
diff --git a/src/factory_test.cairo b/src/factory_test.cairo
index 7380e23..b90679f 100644
--- a/src/factory_test.cairo
+++ b/src/factory_test.cairo
@@ -1,29 +1,28 @@
-use array::{ArrayTrait};
-use debug::PrintTrait;
-use governance::interfaces::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
-use governance::governor::{Config as GovernorConfig};
+use core::array::{ArrayTrait};
+use core::option::{OptionTrait};
+
+use core::result::{Result, ResultTrait};
+use core::traits::{TryInto};
+use governance::airdrop::{Airdrop};
+use governance::airdrop::{IAirdropDispatcherTrait};
 use governance::factory::{
     IFactoryDispatcher, IFactoryDispatcherTrait, Factory, DeploymentParameters, AirdropConfig,
     TimelockConfig,
 };
 use governance::governance_token::{GovernanceToken};
+use governance::governance_token::{IGovernanceTokenDispatcherTrait};
+use governance::governor::{Config as GovernorConfig};
 use governance::governor::{Governor};
+
+use governance::governor::{IGovernorDispatcherTrait};
+use governance::interfaces::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
+use governance::timelock::{ITimelockDispatcherTrait};
 use governance::timelock::{Timelock};
-use governance::airdrop::{Airdrop};
+use starknet::class_hash::{Felt252TryIntoClassHash};
+use starknet::testing::{set_contract_address, set_block_timestamp, pop_log};
 use starknet::{
     get_contract_address, deploy_syscall, ClassHash, contract_address_const, ContractAddress,
 };
-use starknet::class_hash::{Felt252TryIntoClassHash};
-use starknet::testing::{set_contract_address, set_block_timestamp, pop_log};
-use traits::{TryInto};
-
-use governance::governor::{IGovernorDispatcherTrait};
-use governance::governance_token::{IGovernanceTokenDispatcherTrait};
-use governance::airdrop::{IAirdropDispatcherTrait};
-use governance::timelock::{ITimelockDispatcherTrait};
-
-use result::{Result, ResultTrait};
-use option::{OptionTrait};
 
 fn deploy() -> IFactoryDispatcher {
     let mut constructor_args: Array<felt252> = ArrayTrait::new();
diff --git a/src/governance_token.cairo b/src/governance_token.cairo
index ae8c4f0..f7d448c 100644
--- a/src/governance_token.cairo
+++ b/src/governance_token.cairo
@@ -27,13 +27,13 @@ trait IGovernanceToken<TStorage> {
 
 #[starknet::contract]
 mod GovernanceToken {
+    use core::integer::{u256_safe_divmod, u256_as_non_zero};
+    use core::num::traits::zero::{Zero};
+    use core::option::{OptionTrait};
+    use core::traits::{Into, TryInto};
     use governance::interfaces::erc20::{IERC20};
-    use super::{IGovernanceToken, ContractAddress};
-    use traits::{Into, TryInto};
-    use option::{OptionTrait};
     use starknet::{get_caller_address, get_block_timestamp, StorePacking};
-    use zeroable::{Zeroable};
-    use integer::{u256_safe_divmod, u256_as_non_zero};
+    use super::{IGovernanceToken, ContractAddress};
 
     #[derive(Copy, Drop, PartialEq)]
     struct DelegatedSnapshot {
@@ -81,7 +81,7 @@ mod GovernanceToken {
         self
             .emit(
                 Transfer {
-                    from: Zeroable::zero(), to: get_caller_address(), value: total_supply.into()
+                    from: Zero::zero(), to: get_caller_address(), value: total_supply.into()
                 }
             );
     }
diff --git a/src/governance_token_test.cairo b/src/governance_token_test.cairo
index 1019b8a..762ea81 100644
--- a/src/governance_token_test.cairo
+++ b/src/governance_token_test.cairo
@@ -1,19 +1,19 @@
-use array::{ArrayTrait};
-use debug::PrintTrait;
-use governance::interfaces::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
+use core::array::{ArrayTrait};
+use core::num::traits::zero::{Zero};
+use core::option::{OptionTrait};
+use core::result::{Result, ResultTrait};
+use core::traits::{TryInto};
+
 use governance::governance_token::{
     IGovernanceTokenDispatcher, IGovernanceTokenDispatcherTrait, GovernanceToken,
     GovernanceToken::{DelegatedSnapshotStorePacking, DelegatedSnapshot},
 };
+use governance::interfaces::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
+use starknet::class_hash::Felt252TryIntoClassHash;
+use starknet::testing::{set_contract_address, set_block_timestamp, pop_log};
 use starknet::{
     get_contract_address, deploy_syscall, ClassHash, contract_address_const, ContractAddress,
 };
-use starknet::class_hash::Felt252TryIntoClassHash;
-use starknet::testing::{set_contract_address, set_block_timestamp, pop_log};
-use traits::{TryInto};
-
-use result::{Result, ResultTrait};
-use option::{OptionTrait};
 
 fn deploy(
     name: felt252, symbol: felt252, supply: u128
@@ -414,7 +414,7 @@ fn test_delegate_undelegate() {
     token.delegate(delegatee);
 
     set_block_timestamp(5);
-    token.delegate(Zeroable::zero());
+    token.delegate(Zero::zero());
     set_block_timestamp(8);
 
     assert(token.get_delegated(delegatee) == 0, 'delegated');
diff --git a/src/governor.cairo b/src/governor.cairo
index de10e0c..5e35ef6 100644
--- a/src/governor.cairo
+++ b/src/governor.cairo
@@ -1,10 +1,10 @@
+use core::array::{Array};
+use core::integer::{u128_safe_divmod, u128_as_non_zero};
+use core::option::{Option, OptionTrait};
+use core::traits::{Into, TryInto};
 use governance::governance_token::{IGovernanceTokenDispatcher, IGovernanceTokenDispatcherTrait};
-use starknet::{ContractAddress, StorePacking};
-use array::{Array};
 use starknet::account::{Call};
-use option::{Option, OptionTrait};
-use integer::{u128_safe_divmod, u128_as_non_zero};
-use traits::{Into, TryInto};
+use starknet::{ContractAddress, StorePacking};
 
 #[derive(Copy, Drop, Serde, PartialEq)]
 struct ProposalTimestamps {
@@ -81,15 +81,15 @@ trait IGovernor<TStorage> {
 
 #[starknet::contract]
 mod Governor {
+    use core::hash::{LegacyHash};
+    use core::num::traits::zero::{Zero};
+    use governance::call_trait::{HashCall, CallTrait};
+    use governance::governance_token::{IGovernanceTokenDispatcherTrait};
+    use starknet::{get_block_timestamp, get_caller_address, contract_address_const};
     use super::{
         ContractAddress, Array, IGovernor, IGovernanceTokenDispatcher, Config, ProposalInfo, Call,
         ProposalTimestamps
     };
-    use starknet::{get_block_timestamp, get_caller_address, contract_address_const};
-    use governance::call_trait::{HashCall, CallTrait};
-    use governance::governance_token::{IGovernanceTokenDispatcherTrait};
-    use zeroable::{Zeroable};
-    use hash::{LegacyHash};
 
 
     #[derive(starknet::Event, Drop)]
@@ -295,7 +295,7 @@ mod Governor {
             let data = call.execute();
 
             self.emit(Executed { id, });
-            
+
             data
         }
 
diff --git a/src/governor_test.cairo b/src/governor_test.cairo
index bb57120..7611856 100644
--- a/src/governor_test.cairo
+++ b/src/governor_test.cairo
@@ -1,29 +1,29 @@
 use core::array::SpanTrait;
-use array::{ArrayTrait};
-use debug::PrintTrait;
+use core::array::{ArrayTrait};
+use core::num::traits::zero::{Zero};
+use core::option::{OptionTrait};
+
+use core::result::{Result, ResultTrait};
+use core::serde::Serde;
+use core::traits::{TryInto};
+
+use governance::call_trait::{CallTrait};
+use governance::governance_token::{IGovernanceTokenDispatcher, IGovernanceTokenDispatcherTrait};
+use governance::governance_token_test::{deploy as deploy_token};
 use governance::governor::{
     IGovernorDispatcher, IGovernorDispatcherTrait, Governor, Config, ProposalInfo,
     ProposalTimestamps
 };
 use governance::interfaces::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
-use governance::governance_token::{IGovernanceTokenDispatcher, IGovernanceTokenDispatcherTrait};
-use governance::call_trait::{CallTrait};
-use starknet::account::{Call};
+use governance::timelock::{ITimelockDispatcher, ITimelockDispatcherTrait};
 use governance::timelock_test::{single_call, transfer_call, deploy as deploy_timelock};
 use governance::{test_utils as utils};
-use governance::timelock::{ITimelockDispatcher, ITimelockDispatcherTrait};
+use starknet::account::{Call};
+use starknet::class_hash::Felt252TryIntoClassHash;
 use starknet::{
     get_contract_address, deploy_syscall, ClassHash, contract_address_const, ContractAddress,
     get_block_timestamp, testing::{set_block_timestamp, set_contract_address}
 };
-use starknet::class_hash::Felt252TryIntoClassHash;
-use traits::{TryInto};
-
-use result::{Result, ResultTrait};
-use option::{OptionTrait};
-use governance::governance_token_test::{deploy as deploy_token};
-use serde::Serde;
-use zeroable::{Zeroable};
 
 
 fn deploy(voting_token: IGovernanceTokenDispatcher, config: Config) -> IGovernorDispatcher {
@@ -668,7 +668,7 @@ fn test_verify_votes_are_counted_over_voting_weight_smoothing_duration_from_star
     set_block_timestamp(current_timestamp); // 20 seconds before voting starts
     // undelegate 20 seconds before voting starts, so only 1/3rd of voting power is counted for voter1
     set_contract_address(voter1);
-    token.delegate(Zeroable::zero());
+    token.delegate(Zero::zero());
 
     current_timestamp += 20;
     set_block_timestamp(current_timestamp); // voting starts
diff --git a/src/lib.cairo b/src/lib.cairo
index 21e58e6..a3145b0 100644
--- a/src/lib.cairo
+++ b/src/lib.cairo
@@ -1,22 +1,22 @@
 mod airdrop;
-mod call_trait;
-mod factory;
-mod governance_token;
-mod governor;
-mod interfaces;
-mod timelock;
 
 #[cfg(test)]
 mod airdrop_test;
+mod call_trait;
 #[cfg(test)]
 mod call_trait_test;
+mod factory;
 #[cfg(test)]
 mod factory_test;
+mod governance_token;
 #[cfg(test)]
 mod governance_token_test;
+mod governor;
 #[cfg(test)]
 mod governor_test;
+mod interfaces;
 #[cfg(test)]
 mod test_utils;
+mod timelock;
 #[cfg(test)]
 mod timelock_test;
diff --git a/src/test_utils.cairo b/src/test_utils.cairo
index 5a83322..e4bd7af 100644
--- a/src/test_utils.cairo
+++ b/src/test_utils.cairo
@@ -1,5 +1,5 @@
+use core::option::OptionTrait;
 use starknet::{contract_address_try_from_felt252, ContractAddress};
-use option::OptionTrait;
 
 fn recipient() -> ContractAddress {
     contract_address_try_from_felt252('recipient').unwrap()
diff --git a/src/timelock.cairo b/src/timelock.cairo
index 0cbd3a0..c6e54fc 100644
--- a/src/timelock.cairo
+++ b/src/timelock.cairo
@@ -1,6 +1,6 @@
 use core::result::ResultTrait;
-use starknet::{ContractAddress};
 use starknet::account::{Call};
+use starknet::{ContractAddress};
 
 #[starknet::interface]
 trait ITimelock<TStorage> {
@@ -30,17 +30,17 @@ trait ITimelock<TStorage> {
 
 #[starknet::contract]
 mod Timelock {
-    use super::{ITimelock, ContractAddress, Call};
+    use core::array::{ArrayTrait, SpanTrait};
+    use core::hash::{LegacyHash};
+    use core::num::traits::zero::{Zero};
+    use core::result::{ResultTrait};
+    use core::traits::{Into};
     use governance::call_trait::{CallTrait, HashCall};
-    use hash::{LegacyHash};
-    use array::{ArrayTrait, SpanTrait};
     use starknet::{
         get_caller_address, get_contract_address, SyscallResult, syscalls::call_contract_syscall,
         ContractAddressIntoFelt252, get_block_timestamp
     };
-    use result::{ResultTrait};
-    use traits::{Into};
-    use zeroable::{Zeroable};
+    use super::{ITimelock, ContractAddress, Call};
 
     #[derive(starknet::Event, Drop)]
     struct Queued {
diff --git a/src/timelock_test.cairo b/src/timelock_test.cairo
index 8ae1a29..94ace1b 100644
--- a/src/timelock_test.cairo
+++ b/src/timelock_test.cairo
@@ -1,18 +1,18 @@
-use array::{Array, ArrayTrait, SpanTrait};
-use debug::PrintTrait;
-use governance::timelock::{ITimelockDispatcher, ITimelockDispatcherTrait, Timelock};
+use core::array::{Array, ArrayTrait, SpanTrait};
+use core::option::{OptionTrait};
+use core::result::{Result, ResultTrait};
+use core::traits::{TryInto};
+
+use governance::governance_token::{IGovernanceTokenDispatcher, IGovernanceTokenDispatcherTrait};
 use governance::governance_token_test::{deploy as deploy_token};
 use governance::interfaces::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
-use governance::governance_token::{IGovernanceTokenDispatcher, IGovernanceTokenDispatcherTrait};
+use governance::timelock::{ITimelockDispatcher, ITimelockDispatcherTrait, Timelock};
+use starknet::account::{Call};
+use starknet::class_hash::Felt252TryIntoClassHash;
 use starknet::{
     get_contract_address, deploy_syscall, ClassHash, contract_address_const, ContractAddress,
     get_block_timestamp, testing::set_block_timestamp
 };
-use starknet::class_hash::Felt252TryIntoClassHash;
-use starknet::account::{Call};
-use traits::{TryInto};
-use result::{Result, ResultTrait};
-use option::{OptionTrait};
 
 fn deploy(owner: ContractAddress, delay: u64, window: u64) -> ITimelockDispatcher {
     let mut constructor_args: Array<felt252> = ArrayTrait::new();