diff --git a/onchain/cairo/games/src/defi/vault.cairo b/onchain/cairo/games/src/defi/vault.cairo
index 991612957..518bf33f1 100644
--- a/onchain/cairo/games/src/defi/vault.cairo
+++ b/onchain/cairo/games/src/defi/vault.cairo
@@ -1,11 +1,15 @@
-use afk_games::types::defi_types::{TokenPermitted, DepositUser, MintDepositEvent, WithdrawDepositEvent};
+use afk_games::types::defi_types::{
+    TokenPermitted, DepositUser, MintDepositEvent, WithdrawDepositEvent
+};
 use starknet::ContractAddress;
 
 // TODO
 // Create the as a Vault component
 #[starknet::contract]
 pub mod Vault {
-    use afk_games::interfaces::erc20_mintable::{IERC20MintableDispatcher, IERC20MintableDispatcherTrait};
+    use afk_games::interfaces::erc20_mintable::{
+        IERC20MintableDispatcher, IERC20MintableDispatcherTrait
+    };
     use afk_games::interfaces::vault::{IERCVault};
     use afk_games::tokens::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
     use afk_games::types::constants::{ // MINTER_ROLE,
diff --git a/onchain/cairo/games/src/lib.cairo b/onchain/cairo/games/src/lib.cairo
index 609d5dec0..33383c732 100644
--- a/onchain/cairo/games/src/lib.cairo
+++ b/onchain/cairo/games/src/lib.cairo
@@ -1,4 +1,3 @@
-
 pub mod errors;
 
 pub mod math;
@@ -46,7 +45,6 @@ pub mod pixel {
 }
 
 
-
 pub mod quests {
     pub mod authority_quest;
     pub mod chain_faction_quest;
@@ -64,8 +62,6 @@ pub mod quests {
 }
 
 
-
-
 pub mod types {
     pub mod constants;
     pub mod quest;
diff --git a/onchain/cairo/games/src/pixel/art_peace.cairo b/onchain/cairo/games/src/pixel/art_peace.cairo
index 5d62ba370..1a2830f79 100644
--- a/onchain/cairo/games/src/pixel/art_peace.cairo
+++ b/onchain/cairo/games/src/pixel/art_peace.cairo
@@ -11,10 +11,7 @@ pub mod ArtPeace {
         ExtraPixelsPlaced, DailyQuestClaimed, MainQuestClaimed, VoteColor, VotableColorAdded,
         FactionCreated, FactionLeaderChanged, ChainFactionCreated, FactionJoined, FactionLeft,
         ChainFactionJoined, FactionTemplateAdded, FactionTemplateRemoved, ChainFactionTemplateAdded,
-        ChainFactionTemplateRemoved, 
-         InitParams,
-         MetadataPixel,
-         PixelMetadataPlaced
+        ChainFactionTemplateRemoved, InitParams, MetadataPixel, PixelMetadataPlaced
     };
     use afk_games::interfaces::pixel_template::{
         ITemplateVerifier, ITemplateStore, FactionTemplateMetadata, TemplateMetadata
@@ -221,8 +218,7 @@ pub mod ArtPeace {
         while i < color_count {
             self.color_palette.write(i, *init_params.color_palette.at(i.into()));
             // TODO fix events
-            self.emit(ColorAdded { color_key: i, color: *init_params.color_palette.at(i.into())
-            });
+            self.emit(ColorAdded { color_key: i, color: *init_params.color_palette.at(i.into()) });
             i += 1;
         };
 
@@ -299,10 +295,11 @@ pub mod ArtPeace {
             // Check if ok
             self
                 .emit(
-                    PixelMetadataPlaced { placed_by: caller, pos:pos,  day:day, color:color, metadata: metadata }
+                    PixelMetadataPlaced {
+                        placed_by: caller, pos: pos, day: day, color: color, metadata: metadata
+                    }
                 );
         }
-
     }
 
     #[abi(embed_v0)]
@@ -411,7 +408,6 @@ pub mod ArtPeace {
         //         );
         // }
 
-
         fn place_pixel_xy(ref self: ContractState, x: u128, y: u128, color: u8, now: u64) {
             let pos = x + y * self.canvas_width.read();
             self.place_pixel(pos, color, now);
diff --git a/onchain/cairo/games/src/pixel/canvas.cairo b/onchain/cairo/games/src/pixel/canvas.cairo
index 9fd23002c..179c7c797 100644
--- a/onchain/cairo/games/src/pixel/canvas.cairo
+++ b/onchain/cairo/games/src/pixel/canvas.cairo
@@ -254,7 +254,8 @@ pub mod Canvas {
 
         let caller = starknet::get_caller_address();
         // TODO: let pixel = Pixel { color, owner: caller };
-        // TODO: self.canvas.write(pos, pixel);                                                     let day = self.day_index.read();
+        // TODO: self.canvas.write(pos, pixel);
+        // let day = self.day_index.read();
         // self
         //     .user_pixels_placed
         //     .write((day, caller, color), self.user_pixels_placed.read((day, caller, color)) + 1);
diff --git a/onchain/cairo/games/src/pixel/canvas_factory.cairo b/onchain/cairo/games/src/pixel/canvas_factory.cairo
index d3a80ca5f..24c52d5f9 100644
--- a/onchain/cairo/games/src/pixel/canvas_factory.cairo
+++ b/onchain/cairo/games/src/pixel/canvas_factory.cairo
@@ -1,5 +1,5 @@
-use core::starknet::{ContractAddress, ClassHash};
 use afk_games::pixel::canvas::Canvas;
+use core::starknet::{ContractAddress, ClassHash};
 
 #[starknet::interface]
 pub trait ICanvasFactory<TContractState> {
@@ -18,9 +18,8 @@ pub trait ICanvasFactory<TContractState> {
 
 #[starknet::contract]
 pub mod CanvasFactory {
-    use starknet::syscalls::deploy_syscall;
-    use core::starknet::{get_caller_address, ContractAddress, ClassHash};
     use afk_games::pixel::canvas::Canvas;
+    use core::starknet::{get_caller_address, ContractAddress, ClassHash};
     use starknet::storage::{
         Map, StorageMapReadAccess, StorageMapWriteAccess, // Stor
          StoragePointerReadAccess,
@@ -33,6 +32,7 @@ pub mod CanvasFactory {
     // StorageAsPathWriteForward,
     // PathableStorageEntryImpl
     };
+    use starknet::syscalls::deploy_syscall;
     #[storage]
     struct Storage {
         owner: ContractAddress,
@@ -124,7 +124,8 @@ pub mod CanvasFactory {
         fn create_canvas(
             ref self: ContractState, init_params: super::Canvas::InitParams
         ) -> (ContractAddress, u64) {
-            // TODO: Serialize before calling this function to defer serialization to the contract input
+            // TODO: Serialize before calling this function to defer serialization to the contract
+            // input
             let mut init_params_serialized = array![];
             init_params.serialize(ref init_params_serialized);
             let deploy_res = deploy_syscall(
diff --git a/onchain/cairo/games/src/quests/authority_quest.cairo b/onchain/cairo/games/src/quests/authority_quest.cairo
index 508098cbe..dedfbcac1 100644
--- a/onchain/cairo/games/src/quests/authority_quest.cairo
+++ b/onchain/cairo/games/src/quests/authority_quest.cairo
@@ -1,6 +1,8 @@
 #[starknet::contract]
 pub mod AuthorityQuest {
-    use afk_games::interfaces::pixel_template::{ITemplateStoreDispatcher, ITemplateStoreDispatcherTrait};
+    use afk_games::interfaces::pixel_template::{
+        ITemplateStoreDispatcher, ITemplateStoreDispatcherTrait
+    };
     use afk_games::interfaces::quests::{IAuthorityQuest, IQuest};
     use starknet::storage::{
         StoragePointerReadAccess, StoragePointerWriteAccess, StoragePathEntry, Map
diff --git a/onchain/cairo/games/src/quests/chain_faction_quest.cairo b/onchain/cairo/games/src/quests/chain_faction_quest.cairo
index 26890a856..48138603e 100644
--- a/onchain/cairo/games/src/quests/chain_faction_quest.cairo
+++ b/onchain/cairo/games/src/quests/chain_faction_quest.cairo
@@ -1,5 +1,4 @@
 #[starknet::contract]
-
 pub mod ChainFactionQuest {
     use afk_games::interfaces::pixel::{IArtPeaceDispatcher, IArtPeaceDispatcherTrait};
     use afk_games::interfaces::quests::{IAuthorityQuest, IQuest};
diff --git a/onchain/cairo/games/src/quests/template_quest.cairo b/onchain/cairo/games/src/quests/template_quest.cairo
index cfb3de439..8814c5463 100644
--- a/onchain/cairo/games/src/quests/template_quest.cairo
+++ b/onchain/cairo/games/src/quests/template_quest.cairo
@@ -1,6 +1,8 @@
 #[starknet::contract]
 pub mod TemplateQuest {
-    use afk_games::interfaces::pixel_template::{ITemplateStoreDispatcher, ITemplateStoreDispatcherTrait};
+    use afk_games::interfaces::pixel_template::{
+        ITemplateStoreDispatcher, ITemplateStoreDispatcherTrait
+    };
     use afk_games::interfaces::quests::IQuest;
     use starknet::storage::{
         StoragePointerReadAccess, StoragePointerWriteAccess, StoragePathEntry, Map
diff --git a/onchain/cairo/games/src/quests/username_quest.cairo b/onchain/cairo/games/src/quests/username_quest.cairo
index a8195f689..dce00309f 100644
--- a/onchain/cairo/games/src/quests/username_quest.cairo
+++ b/onchain/cairo/games/src/quests/username_quest.cairo
@@ -1,7 +1,9 @@
 #[starknet::contract]
 pub mod UsernameQuest {
     use afk_games::interfaces::quests::{IQuest};
-    use afk_games::interfaces::username_store::{IUsernameStoreDispatcher, IUsernameStoreDispatcherTrait,};
+    use afk_games::interfaces::username_store::{
+        IUsernameStoreDispatcher, IUsernameStoreDispatcherTrait,
+    };
     use starknet::storage::{
         StoragePointerReadAccess, StoragePointerWriteAccess, StoragePathEntry, Map
     };
diff --git a/onchain/cairo/games/src/tests/art_peace_tests.cairo b/onchain/cairo/games/src/tests/art_peace_tests.cairo
index 200c27eec..c82b6196a 100644
--- a/onchain/cairo/games/src/tests/art_peace_tests.cairo
+++ b/onchain/cairo/games/src/tests/art_peace_tests.cairo
@@ -37,7 +37,7 @@ pub(crate) fn deploy_contract() -> ContractAddress {
     let contract = declare("ArtPeace").unwrap().contract_class();
     let mut calldata = array![];
     InitParams {
-        host:HOST(),
+        host: utils::HOST(),
         canvas_width: WIDTH,
         canvas_height: HEIGHT,
         time_between_pixels: TIME_BETWEEN_PIXELS,
@@ -95,7 +95,7 @@ pub(crate) fn deploy_with_quests_contract(
     let daily_quests_count = 3;
     let mut calldata = array![];
     InitParams {
-        host:HOST(),
+        host: utils::HOST(),
         canvas_width: WIDTH,
         canvas_height: HEIGHT,
         time_between_pixels: TIME_BETWEEN_PIXELS,
diff --git a/onchain/cairo/games/src/tests/nameservice_tests.cairo b/onchain/cairo/games/src/tests/nameservice_tests.cairo
index c85d32228..0ea83d4d2 100644
--- a/onchain/cairo/games/src/tests/nameservice_tests.cairo
+++ b/onchain/cairo/games/src/tests/nameservice_tests.cairo
@@ -1,7 +1,9 @@
 #[cfg(test)]
 mod nameservice_tests {
     use afk_games::interfaces::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
-    use afk_games::interfaces::erc20_mintable::{IERC20MintableDispatcher, IERC20MintableDispatcherTrait};
+    use afk_games::interfaces::erc20_mintable::{
+        IERC20MintableDispatcher, IERC20MintableDispatcherTrait
+    };
     use afk_games::interfaces::nameservice::{INameserviceDispatcher, INameserviceDispatcherTrait};
     use snforge_std::{
         declare, ContractClass, ContractClassTrait, start_cheat_caller_address,
diff --git a/onchain/cairo/games/src/tests/quest_factory_test.cairo b/onchain/cairo/games/src/tests/quest_factory_test.cairo
index 759280747..2c9e5b8c2 100644
--- a/onchain/cairo/games/src/tests/quest_factory_test.cairo
+++ b/onchain/cairo/games/src/tests/quest_factory_test.cairo
@@ -1,6 +1,8 @@
 #[cfg(test)]
 mod quest_factory_tests {
-    use afk_games::interfaces::erc20_mintable::{IERC20MintableDispatcher, IERC20MintableDispatcherTrait};
+    use afk_games::interfaces::erc20_mintable::{
+        IERC20MintableDispatcher, IERC20MintableDispatcherTrait
+    };
     use afk_games::interfaces::quest::{
         IQuestFactoryDispatcher, IQuestFactoryDispatcherTrait, IQuestNFTDispatcher,
         IQuestNFTDispatcherTrait, ITapQuestsDispatcher, ITapQuestsDispatcherTrait
diff --git a/onchain/cairo/games/src/tests/vault_tests.cairo b/onchain/cairo/games/src/tests/vault_tests.cairo
index 0247b5aed..317adb0b0 100644
--- a/onchain/cairo/games/src/tests/vault_tests.cairo
+++ b/onchain/cairo/games/src/tests/vault_tests.cairo
@@ -1,7 +1,9 @@
 #[cfg(test)]
 mod vault_test {
     use afk_games::defi::vault::Vault::Event;
-    use afk_games::interfaces::erc20_mintable::{IERC20MintableDispatcher, IERC20MintableDispatcherTrait};
+    use afk_games::interfaces::erc20_mintable::{
+        IERC20MintableDispatcher, IERC20MintableDispatcherTrait
+    };
     use afk_games::interfaces::vault::{IERCVaultDispatcher, IERCVaultDispatcherTrait};
     use afk_games::tokens::erc20::{IERC20Dispatcher, IERC20DispatcherTrait};
     use afk_games::types::defi_types::{ // TokenPermitted, DepositUser,
diff --git a/onchain/cairo/utils/src/lib.cairo b/onchain/cairo/utils/src/lib.cairo
index 4fc1752e6..6f082d379 100644
--- a/onchain/cairo/utils/src/lib.cairo
+++ b/onchain/cairo/utils/src/lib.cairo
@@ -9,8 +9,8 @@ pub mod types {
 
 #[cfg(test)]
 pub mod tests {
-    pub mod utils;
     pub mod bip340;
+    pub mod utils;
     // pub mod sha256;
-    // pub mod math;
+// pub mod math;
 }