diff --git a/src/lib.cairo b/src/lib.cairo
index cd5f5549..ab74b522 100644
--- a/src/lib.cairo
+++ b/src/lib.cairo
@@ -19,4 +19,4 @@ mod random {
 
 mod security {
     mod commitment;
-}
\ No newline at end of file
+}
diff --git a/src/tokens/src/erc1155/erc1155.cairo b/src/tokens/src/erc1155/erc1155.cairo
index af50183e..aeb7f33a 100644
--- a/src/tokens/src/erc1155/erc1155.cairo
+++ b/src/tokens/src/erc1155/erc1155.cairo
@@ -2,4 +2,4 @@ mod erc1155;
 mod models;
 mod interface;
 
-use erc1155::ERC1155;
\ No newline at end of file
+use erc1155::ERC1155;
diff --git a/src/tokens/src/erc1155/erc1155/erc1155.cairo b/src/tokens/src/erc1155/erc1155/erc1155.cairo
index 26ba7f23..ff633a30 100644
--- a/src/tokens/src/erc1155/erc1155/erc1155.cairo
+++ b/src/tokens/src/erc1155/erc1155/erc1155.cairo
@@ -1,8 +1,6 @@
 #[starknet::contract]
 mod ERC1155 {
-    use dojo_erc::token::erc1155::models::{
-        ERC1155Meta, ERC1155OperatorApproval, ERC1155Balance
-    };
+    use dojo_erc::token::erc1155::models::{ERC1155Meta, ERC1155OperatorApproval, ERC1155Balance};
     use dojo_erc::token::erc1155::interface;
     use dojo_erc::token::erc1155::interface::{IERC1155, IERC1155CamelOnly};
     use dojo::world::{IWorldDispatcher, IWorldDispatcherTrait};
diff --git a/src/tokens/src/erc1155/erc1155/models.cairo b/src/tokens/src/erc1155/erc1155/models.cairo
index fa021aa9..3e1861e3 100644
--- a/src/tokens/src/erc1155/erc1155/models.cairo
+++ b/src/tokens/src/erc1155/erc1155/models.cairo
@@ -30,4 +30,4 @@ struct ERC1155Balance {
     #[key]
     id: u256,
     amount: u256
-}
\ No newline at end of file
+}
diff --git a/src/tokens/src/erc721/erc721.cairo b/src/tokens/src/erc721/erc721.cairo
index 57f84720..4a181988 100644
--- a/src/tokens/src/erc721/erc721.cairo
+++ b/src/tokens/src/erc721/erc721.cairo
@@ -27,11 +27,7 @@ mod ERC721 {
     // Internal imports
 
     use presets::erc721::models::{
-        ERC721Meta,
-        ERC721OperatorApproval,
-        ERC721Owner,
-        ERC721Balance,
-        ERC721TokenApproval,
+        ERC721Meta, ERC721OperatorApproval, ERC721Owner, ERC721Balance, ERC721TokenApproval,
     };
 
     // Local imports
diff --git a/src/tokens/src/erc721/models.cairo b/src/tokens/src/erc721/models.cairo
index eec7ec9c..6128b7b3 100644
--- a/src/tokens/src/erc721/models.cairo
+++ b/src/tokens/src/erc721/models.cairo
@@ -47,4 +47,4 @@ struct ERC721TokenApproval {
     #[key]
     token_id: u256,
     address: ContractAddress,
-}
\ No newline at end of file
+}
diff --git a/src/tokens/src/erc721/tests.cairo b/src/tokens/src/erc721/tests.cairo
index cdeef6be..778a4814 100644
--- a/src/tokens/src/erc721/tests.cairo
+++ b/src/tokens/src/erc721/tests.cairo
@@ -469,8 +469,8 @@ fn test_transfer_from_nonexistent() {
 #[should_panic(expected: ('ERC721: invalid token ID',))]
 fn test_transferFrom_nonexistent() {
     //let mut state = STATE();
-     let (world, mut state) = STATE();
-     ERC721CamelOnlyImpl::transferFrom(ref state, ZERO(), RECIPIENT(), TOKEN_ID);
+    let (world, mut state) = STATE();
+    ERC721CamelOnlyImpl::transferFrom(ref state, ZERO(), RECIPIENT(), TOKEN_ID);
 }
 
 #[test]
@@ -489,7 +489,7 @@ fn test_transferFrom_to_zero() {
     let mut state = setup();
 
     testing::set_caller_address(OWNER());
-   ERC721CamelOnlyImpl::transferFrom(ref state, OWNER(), ZERO(), TOKEN_ID);
+    ERC721CamelOnlyImpl::transferFrom(ref state, OWNER(), ZERO(), TOKEN_ID);
 }
 
 #[test]
@@ -518,7 +518,7 @@ fn test_transferFrom_to_owner() {
 
     testing::set_caller_address(OWNER());
     ERC721CamelOnlyImpl::transferFrom(ref state, OWNER(), OWNER(), TOKEN_ID);
-    assert_event_transfer( OWNER(), OWNER(), TOKEN_ID);
+    assert_event_transfer(OWNER(), OWNER(), TOKEN_ID);
 
     assert(ERC721Impl::owner_of(@state, TOKEN_ID) == OWNER(), 'Ownership after');
     assert(ERC721Impl::balance_of(@state, OWNER()) == 1, 'Balance of owner after');
@@ -551,7 +551,7 @@ fn test_transferFrom_approved() {
     let token_id = TOKEN_ID;
     let owner = OWNER();
     let recipient = RECIPIENT();
-    assert_state_before_transfer(@state,owner, recipient, token_id);
+    assert_state_before_transfer(@state, owner, recipient, token_id);
 
     testing::set_caller_address(owner);
     ERC721Impl::approve(ref state, OPERATOR(), token_id);
@@ -561,7 +561,7 @@ fn test_transferFrom_approved() {
     ERC721CamelOnlyImpl::transferFrom(ref state, owner, recipient, token_id);
     assert_event_transfer(owner, recipient, token_id);
 
-    assert_state_after_transfer(@state,owner, recipient, token_id);
+    assert_state_after_transfer(@state, owner, recipient, token_id);
 }
 
 #[test]
@@ -593,7 +593,7 @@ fn test_transferFrom_approved_for_all() {
     let owner = OWNER();
     let recipient = RECIPIENT();
 
-    assert_state_before_transfer(@state,owner, recipient, token_id);
+    assert_state_before_transfer(@state, owner, recipient, token_id);
 
     testing::set_caller_address(owner);
     ERC721Impl::set_approval_for_all(ref state, OPERATOR(), true);
@@ -603,7 +603,7 @@ fn test_transferFrom_approved_for_all() {
     ERC721CamelOnlyImpl::transferFrom(ref state, owner, recipient, token_id);
     assert_event_transfer(owner, recipient, token_id);
 
-    assert_state_after_transfer(@state,owner, recipient, token_id);
+    assert_state_after_transfer(@state, owner, recipient, token_id);
 }
 
 #[test]
diff --git a/src/tokens/src/lib.cairo b/src/tokens/src/lib.cairo
index 95234237..c6129437 100644
--- a/src/tokens/src/lib.cairo
+++ b/src/tokens/src/lib.cairo
@@ -10,4 +10,4 @@ mod erc721 {
 mod tests {
     mod constants;
     mod utils;
-}
\ No newline at end of file
+}