--- a/common-types/src/lib.rs
+++ b/common-types/src/lib.rs
@@ -17,8 +17,9 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use sp_runtime::{
-    generic,
-	traits::{Verify, IdentifyAccount}, MultiSignature,
+	generic,
+	traits::{Verify, IdentifyAccount},
+	MultiSignature,
 };
 
 /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
@@ -26,33 +27,29 @@
 /// of data like extrinsics, allowing for them to continue syncing the network through upgrades
 /// to even the core data structures.
 pub mod opaque {
-    pub use sp_runtime::{
-        generic,
-        traits::BlakeTwo256,
-        OpaqueExtrinsic as UncheckedExtrinsic
-    };
+	pub use sp_runtime::{generic, traits::BlakeTwo256, OpaqueExtrinsic as UncheckedExtrinsic};
 
 	pub use super::{BlockNumber, Signature, AccountId, Balance, Index, Hash, AuraId};
 
-    /// Opaque block header type.
-    pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
+	/// Opaque block header type.
+	pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 
-    /// Opaque block type.
-    pub type Block = generic::Block<Header, UncheckedExtrinsic>;
+	/// Opaque block type.
+	pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
-    pub trait RuntimeInstance {
-        type CrossAccountId: pallet_evm::account::CrossAccountId<sp_runtime::AccountId32>
-            + Send
-            + Sync
-            + 'static;
+	pub trait RuntimeInstance {
+		type CrossAccountId: pallet_evm::account::CrossAccountId<sp_runtime::AccountId32>
+			+ Send
+			+ Sync
+			+ 'static;
 
-        type TransactionConverter: fp_rpc::ConvertTransaction<UncheckedExtrinsic>
-            + Send
-            + Sync
-            + 'static;
+		type TransactionConverter: fp_rpc::ConvertTransaction<UncheckedExtrinsic>
+			+ Send
+			+ Sync
+			+ 'static;
 
-        fn get_transaction_converter() -> Self::TransactionConverter;
-    }
+		fn get_transaction_converter() -> Self::TransactionConverter;
+	}
 }
 
 pub type SessionHandlers = ();
--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -40,9 +40,7 @@
 use sc_service::TransactionPool;
 use std::{collections::BTreeMap, sync::Arc};
 
-use common_types::opaque::{
-	Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance,
-};
+use common_types::opaque::{Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance};
 
 // RMRK
 use up_data_structs::{
--- a/runtime/common/config/ethereum.rs
+++ b/runtime/common/config/ethereum.rs
@@ -1,28 +1,18 @@
 use sp_core::{U256, H160};
 use frame_support::{
-    weights::{Weight, constants::WEIGHT_PER_SECOND},
-    traits::{FindAuthor},
-    parameter_types, ConsensusEngineId,
+	weights::{Weight, constants::WEIGHT_PER_SECOND},
+	traits::{FindAuthor},
+	parameter_types, ConsensusEngineId,
 };
 use sp_runtime::{RuntimeAppPublic, Perbill};
 use crate::{
-    runtime_common::{
-		constants::*,
-        dispatch::CollectionDispatchT,
-        ethereum::sponsoring::EvmSponsorshipHandler,
-		config::sponsoring::DefaultSponsoringRateLimit,
-        DealWithFees,
-    },
-    Runtime,
-    Aura,
-    Balances,
-    Event,
-    ChainId,
+	runtime_common::{
+		constants::*, dispatch::CollectionDispatchT, ethereum::sponsoring::EvmSponsorshipHandler,
+		config::sponsoring::DefaultSponsoringRateLimit, DealWithFees,
+	},
+	Runtime, Aura, Balances, Event, ChainId,
 };
-use pallet_evm::{
-    EnsureAddressTruncated,
-    HashedAddressMapping,
-};
+use pallet_evm::{EnsureAddressTruncated, HashedAddressMapping};
 
 pub type CrossAccountId = pallet_evm::account::BasicCrossAccountId<Runtime>;
 
@@ -116,7 +106,7 @@
 }
 
 parameter_types! {
-    // 0x842899ECF380553E8a4de75bF534cdf6fBF64049
+	// 0x842899ECF380553E8a4de75bF534cdf6fBF64049
 	pub const HelpersContractAddress: H160 = H160([
 		0x84, 0x28, 0x99, 0xec, 0xf3, 0x80, 0x55, 0x3e, 0x8a, 0x4d, 0xe7, 0x5b, 0xf5, 0x34, 0xcd, 0xf6, 0xfb, 0xf6, 0x40, 0x49,
 	]);
--- a/runtime/common/config/mod.rs
+++ b/runtime/common/config/mod.rs
@@ -14,10 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-pub mod substrate;
 pub mod ethereum;
-pub mod sponsoring;
+pub mod orml;
 pub mod pallets;
 pub mod parachain;
+pub mod sponsoring;
+pub mod substrate;
 pub mod xcm;
-pub mod orml;
--- a/runtime/common/config/orml.rs
+++ b/runtime/common/config/orml.rs
@@ -16,10 +16,7 @@
 
 use frame_support::parameter_types;
 use frame_system::EnsureSigned;
-use crate::{
-    runtime_common::constants::*,
-    Runtime, Event, RelayChainBlockNumberProvider,
-};
+use crate::{runtime_common::constants::*, Runtime, Event, RelayChainBlockNumberProvider};
 use common_types::{AccountId, Balance};
 
 parameter_types! {
--- a/runtime/common/config/pallets/mod.rs
+++ b/runtime/common/config/pallets/mod.rs
@@ -17,24 +17,18 @@
 use frame_support::parameter_types;
 use sp_runtime::traits::AccountIdConversion;
 use crate::{
-    runtime_common::{
-        constants::*,
-        dispatch::CollectionDispatchT,
-        config::{
-            substrate::TreasuryModuleId,
-            ethereum::EvmCollectionHelpersAddress,
-        },
-        weights::CommonWeights,
-        RelayChainBlockNumberProvider,
-    },
-    Runtime,
-    Event,
-    Call,
-    Balances,
+	runtime_common::{
+		constants::*,
+		dispatch::CollectionDispatchT,
+		config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},
+		weights::CommonWeights,
+		RelayChainBlockNumberProvider,
+	},
+	Runtime, Event, Call, Balances,
 };
 use common_types::{AccountId, Balance, BlockNumber};
 use up_data_structs::{
-    mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},
+	mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},
 };
 
 #[cfg(feature = "rmrk")]
--- a/runtime/common/config/pallets/scheduler.rs
+++ b/runtime/common/config/pallets/scheduler.rs
@@ -14,20 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-use frame_support::{
-    traits::PrivilegeCmp,
-    weights::Weight,
-    parameter_types
-};
+use frame_support::{traits::PrivilegeCmp, weights::Weight, parameter_types};
 use frame_system::EnsureSigned;
 use sp_runtime::Perbill;
 use sp_std::cmp::Ordering;
 use crate::{
-    runtime_common::{
-        scheduler::SchedulerPaymentExecutor,
-        config::substrate::RuntimeBlockWeights,
-    },
-    Runtime, Call, Event, Origin, OriginCaller, Balances
+	runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},
+	Runtime, Call, Event, Origin, OriginCaller, Balances,
 };
 use common_types::AccountId;
 
@@ -36,7 +29,7 @@
 		RuntimeBlockWeights::get().max_block;
 	pub const MaxScheduledPerBlock: u32 = 50;
 
-    pub const NoPreimagePostponement: Option<u32> = Some(10);
+	pub const NoPreimagePostponement: Option<u32> = Some(10);
 	pub const Preimage: Option<u32> = Some(10);
 }
 
--- a/runtime/common/config/parachain.rs
+++ b/runtime/common/config/parachain.rs
@@ -14,17 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-use frame_support::{
-    weights::Weight,
-    parameter_types,
-};
-use crate::{
-    runtime_common::constants::*,
-    Runtime,
-    Event,
-    XcmpQueue,
-    DmpQueue,
-};
+use frame_support::{weights::Weight, parameter_types};
+use crate::{runtime_common::constants::*, Runtime, Event, XcmpQueue, DmpQueue};
 
 parameter_types! {
 	pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;
--- a/runtime/common/config/sponsoring.rs
+++ b/runtime/common/config/sponsoring.rs
@@ -16,16 +16,13 @@
 
 use frame_support::parameter_types;
 use crate::{
-    runtime_common::{
-        constants::*,
-        sponsoring::UniqueSponsorshipHandler,
-    },
-    Runtime,
+	runtime_common::{constants::*, sponsoring::UniqueSponsorshipHandler},
+	Runtime,
 };
 use common_types::BlockNumber;
 
 parameter_types! {
-    pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;
+	pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;
 }
 
 type SponsorshipHandler = (
--- a/runtime/common/config/substrate.rs
+++ b/runtime/common/config/substrate.rs
@@ -18,11 +18,10 @@
 	traits::{Everything, ConstU32},
 	weights::{
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight},
-		DispatchClass, WeightToFeePolynomial, WeightToFeeCoefficients,
-		ConstantMultiplier, WeightToFeeCoefficient,
+		DispatchClass, WeightToFeePolynomial, WeightToFeeCoefficients, ConstantMultiplier,
+		WeightToFeeCoefficient,
 	},
-	parameter_types,
-	PalletId,
+	parameter_types, PalletId,
 };
 use sp_runtime::{
 	generic,
@@ -36,20 +35,8 @@
 use sp_arithmetic::traits::{BaseArithmetic, Unsigned};
 use smallvec::smallvec;
 use crate::{
-    runtime_common::{
-        DealWithFees,
-        constants::*,
-    },
-	Runtime,
-	Event,
-	Call,
-	Origin,
-	PalletInfo,
-	System,
-	Balances,
-	Treasury,
-	SS58Prefix,
-	Version,
+	runtime_common::{DealWithFees, constants::*},
+	Runtime, Event, Call, Origin, PalletInfo, System, Balances, Treasury, SS58Prefix, Version,
 };
 use common_types::*;
 
--- a/runtime/common/config/xcm.rs
+++ b/runtime/common/config/xcm.rs
@@ -15,19 +15,15 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 use frame_support::{
-    traits::{
-        tokens::currency::Currency as CurrencyT,
-        OnUnbalanced as OnUnbalancedT,
-        Get, Everything
-    },
-    weights::{Weight, WeightToFeePolynomial, WeightToFee},
-    parameter_types, match_types,
+	traits::{
+		tokens::currency::Currency as CurrencyT, OnUnbalanced as OnUnbalancedT, Get, Everything,
+	},
+	weights::{Weight, WeightToFeePolynomial, WeightToFee},
+	parameter_types, match_types,
 };
 use frame_system::EnsureRoot;
 use sp_runtime::{
-	traits::{
-		Saturating, CheckedConversion, Zero,
-	},
+	traits::{Saturating, CheckedConversion, Zero},
 	SaturatedConversion,
 };
 use pallet_xcm::XcmPassthrough;
@@ -36,8 +32,7 @@
 use xcm::latest::{
 	AssetId::{Concrete},
 	Fungibility::Fungible as XcmFungible,
-	MultiAsset,
-	Error as XcmError,
+	MultiAsset, Error as XcmError,
 };
 use xcm_executor::traits::{MatchesFungible, WeightTrader};
 use xcm_builder::{
@@ -49,19 +44,8 @@
 use xcm_executor::{Config, XcmExecutor, Assets};
 use sp_std::marker::PhantomData;
 use crate::{
-    runtime_common::{
-        constants::*,
-        config::substrate::LinearFee
-    },
-    Runtime,
-    Call,
-    Event,
-    Origin,
-    Balances,
-    ParachainInfo,
-    ParachainSystem,
-    PolkadotXcm,
-    XcmpQueue,
+	runtime_common::{constants::*, config::substrate::LinearFee},
+	Runtime, Call, Event, Origin, Balances, ParachainInfo, ParachainSystem, PolkadotXcm, XcmpQueue,
 };
 use common_types::{AccountId, Balance};
 
--- a/runtime/common/ethereum/mod.rs
+++ b/runtime/common/ethereum/mod.rs
@@ -14,6 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
+pub mod self_contained_call;
 pub mod sponsoring;
 pub mod transaction_converter;
-pub mod self_contained_call;
--- a/runtime/common/ethereum/self_contained_call.rs
+++ b/runtime/common/ethereum/self_contained_call.rs
@@ -16,8 +16,8 @@
 
 use sp_core::H160;
 use sp_runtime::{
-    traits::{Dispatchable, DispatchInfoOf, PostDispatchInfoOf},
-    transaction_validity::{TransactionValidityError, TransactionValidity},
+	traits::{Dispatchable, DispatchInfoOf, PostDispatchInfoOf},
+	transaction_validity::{TransactionValidityError, TransactionValidity},
 };
 use crate::{Origin, Call};
 
--- a/runtime/common/ethereum/sponsoring.rs
+++ b/runtime/common/ethereum/sponsoring.rs
@@ -27,10 +27,7 @@
 use up_data_structs::{TokenId, CreateItemData, CreateNftData, CollectionMode};
 use pallet_unique::Config as UniqueConfig;
 
-use crate::{
-	Runtime,
-	runtime_common::sponsoring::*
-};
+use crate::{Runtime, runtime_common::sponsoring::*};
 
 use pallet_nonfungible::erc::{
 	UniqueNFTCall, ERC721UniqueExtensionsCall, ERC721MintableCall, ERC721Call, TokenPropertiesCall,
--- a/runtime/common/ethereum/transaction_converter.rs
+++ b/runtime/common/ethereum/transaction_converter.rs
@@ -15,11 +15,7 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 use codec::{Encode, Decode};
-use crate::{
-    opaque,
-    Runtime,
-    UncheckedExtrinsic,
-};
+use crate::{opaque, Runtime, UncheckedExtrinsic};
 
 pub struct TransactionConverter;
 
--- a/runtime/common/instance.rs
+++ b/runtime/common/instance.rs
@@ -1,9 +1,8 @@
 use crate::{
-    runtime_common::{
-        config::ethereum::CrossAccountId,
-        ethereum::transaction_converter::TransactionConverter
-    },
-    Runtime,
+	runtime_common::{
+		config::ethereum::CrossAccountId, ethereum::transaction_converter::TransactionConverter,
+	},
+	Runtime,
 };
 use common_types::opaque::RuntimeInstance;
 
--- a/runtime/common/mod.rs
+++ b/runtime/common/mod.rs
@@ -14,23 +14,23 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
+pub mod config;
 pub mod constants;
 pub mod construct_runtime;
 pub mod dispatch;
+pub mod ethereum;
+pub mod instance;
 pub mod runtime_apis;
+pub mod scheduler;
 pub mod sponsoring;
 pub mod weights;
-pub mod config;
-pub mod instance;
-pub mod ethereum;
-pub mod scheduler;
 
 use sp_core::H160;
 use frame_support::traits::{Currency, OnUnbalanced, Imbalance};
 use sp_runtime::{
-    generic,
-    traits::{BlakeTwo256, BlockNumberProvider},
-    impl_opaque_keys,
+	generic,
+	traits::{BlakeTwo256, BlockNumberProvider},
+	impl_opaque_keys,
 };
 use sp_std::vec::Vec;
 
@@ -38,7 +38,7 @@
 use sp_version::NativeVersion;
 
 use crate::{
-    Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsReversedWithSystemFirst,
+	Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsReversedWithSystemFirst,
 	InherentDataExt,
 };
 use common_types::{AccountId, BlockNumber};
--- a/runtime/common/scheduler.rs
+++ b/runtime/common/scheduler.rs
@@ -15,19 +15,16 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 use frame_support::{
-    traits::NamedReservableCurrency,
-    weights::{GetDispatchInfo, PostDispatchInfo, DispatchInfo},
+	traits::NamedReservableCurrency,
+	weights::{GetDispatchInfo, PostDispatchInfo, DispatchInfo},
 };
 use sp_runtime::{
-    traits::{Dispatchable, Applyable, Member},
+	traits::{Dispatchable, Applyable, Member},
 	generic::Era,
-    transaction_validity::TransactionValidityError,
+	transaction_validity::TransactionValidityError,
 	DispatchErrorWithPostInfo, DispatchError,
-};
-use crate::{
-    Runtime, Call, Origin, Balances,
-    ChargeTransactionPayment,
 };
+use crate::{Runtime, Call, Origin, Balances, ChargeTransactionPayment};
 use common_types::{AccountId, Balance};
 use fp_self_contained::SelfContainedCall;
 use pallet_unique_scheduler::DispatchCall;
@@ -85,11 +82,11 @@
 			SignedExtraScheduler,
 			SelfContainedSignedInfo,
 		> {
-			signed:
-                fp_self_contained::CheckedSignature::<AccountId, SignedExtraScheduler, SelfContainedSignedInfo>::Signed(
-					signer.clone().into(),
-					get_signed_extras(signer.into()),
-				),
+			signed: fp_self_contained::CheckedSignature::<
+				AccountId,
+				SignedExtraScheduler,
+				SelfContainedSignedInfo,
+			>::Signed(signer.clone().into(), get_signed_extras(signer.into())),
 			function: call.into(),
 		};