diff --git a/indexer/tasks/src/genesis/genesis_txs.rs b/indexer/tasks/src/genesis/genesis_txs.rs
index a2f78240..996c2ccd 100644
--- a/indexer/tasks/src/genesis/genesis_txs.rs
+++ b/indexer/tasks/src/genesis/genesis_txs.rs
@@ -1,6 +1,10 @@
 extern crate shred;
 
-use crate::config::EmptyConfig::EmptyConfig;
+use crate::{
+    config::EmptyConfig::EmptyConfig,
+    dsl::task_macro::*,
+    utils::{blake2b256, TaskPerfAggregator},
+};
 use cardano_multiplatform_lib::{
     address::ByronAddress,
     genesis::byron::{config::GenesisData, parse::redeem_pubkey_to_txid},
@@ -10,14 +14,12 @@ use entity::{
     address,
     prelude::*,
     sea_orm::{DatabaseTransaction, DbErr, EntityTrait, Set},
+    sea_orm::{IntoActiveModel, Iterable},
     transaction, transaction_output,
 };
 use shred::{DispatcherBuilder, ResourceId, System, SystemData, World, Write};
 use std::sync::{Arc, Mutex};
 
-use crate::dsl::task_macro::*;
-use crate::utils::{blake2b256, TaskPerfAggregator};
-use entity::sea_orm::{IntoActiveModel, Iterable};
 use futures::future::{join_all, try_join};
 
 use super::genesis_block::GenesisBlockTask;
diff --git a/indexer/tasks/tests/genesis_helpers.rs b/indexer/tasks/tests/genesis_helpers.rs
index 2474559b..18967b9c 100644
--- a/indexer/tasks/tests/genesis_helpers.rs
+++ b/indexer/tasks/tests/genesis_helpers.rs
@@ -1,18 +1,16 @@
-use cardano_multiplatform_lib::genesis::byron::parse::parse;
 use cardano_multiplatform_lib::{
     address::ByronAddress,
     chain_crypto::{self, Ed25519, KeyPair, PublicKey},
     crypto::BlockHeaderHash,
     fees::LinearFee,
+    genesis::byron::parse::parse,
     genesis::byron::{config::GenesisData, config::ProtocolMagic, parse::redeem_pubkey_to_txid},
-    legacy_address,
-    legacy_address::ExtendedAddr,
+    legacy_address::{self, ExtendedAddr},
     utils::{self, BigNum},
 };
 use entity::{
     block::EraValue,
-    prelude::AddressModel,
-    prelude::{TransactionModel, TransactionOutputModel},
+    prelude::{AddressModel, TransactionModel, TransactionOutputModel},
     sea_orm::{Database, DbConn},
 };
 use proptest::prop_compose;