diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 80c1d84c16..929da7a4f6 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,4 @@
 9d1fd093071278be77428dba189d958d5b7a7aeb
 ddeefdf97d635634083ea286af05c1026d4bc28b
 cdd0ead52f740eca8cedb152307992a11c6b478a
+197f6f2caeaa9ca409ca13a61faae917731ada7f
diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml
index 61768513e3..065a97c0c1 100644
--- a/.github/workflows/check-formatting.yml
+++ b/.github/workflows/check-formatting.yml
@@ -41,11 +41,7 @@ jobs:
 
           for x in $(git ls-tree --full-tree --name-only -r HEAD); do
             if [ "${x##*.}" == "hs" ]; then
-              if grep -qE '^#' "$x"; then
-                echo "$x contains CPP.  Skipping."
-              else
-                "$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
-              fi
+              "$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
             fi
           done
 
@@ -58,11 +54,7 @@ jobs:
           git fetch origin ${{ github.base_ref }} --unshallow
           for x in $(git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }}..HEAD); do
             if [ "${x##*.}" == "hs" ]; then
-              if grep -qE '^#' "$x"; then
-                echo "$x contains CPP.  Skipping."
-              else
-                "$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
-              fi
+              "$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
             fi
           done
 
diff --git a/.stylish-haskell.yaml b/.stylish-haskell.yaml
deleted file mode 100644
index 7218ef5069..0000000000
--- a/.stylish-haskell.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-# Stylish-haskell configuration file.
-
-# Principles:
-#
-# 1. Amount of indent should not be dependent on the length of the previous line
-# 2. Imports lists should be compact
-# 3. All linting rules that delete comments should be disabled
-# 4. No inline indenting, for example indent of ->, =, <-, as
-# 5. Redunant imports and pragmas should be removed
-# 6. Consistent syntax
-# 7. No trailing whitespaces
-# 8. Slightly generous screen width assumed
-# 9. All Haskell files in the project are subject to code formatting style
-# 10. Import grouping is handled by stylish-haskell
-
-steps:
-  # Principle 4
-  - simple_align:
-      cases: false
-      top_level_patterns: false
-      # Principle 3
-      records: false
-
-  # Import cleanup
-  - imports:
-      align: global
-
-      # Principle 1,2
-      list_align: with_module_name
-
-      # Principle 4
-      pad_module_names: false
-
-      # Principle 2
-      long_list_align: inline
-
-      empty_list_align: inherit
-
-      list_padding: 2
-
-      separate_lists: true
-
-      space_surround: false
-
-      # Principle 10
-      group_imports: true
-
-      group_rules:
-        - match: ^Cardano.Api\>
-        - match: ^(Cardano|Ouroboros|PlutusCore|PlutusLedgerApi)\>
-        - match: ^Prelude\>
-        - match: ^(Control|Codec|Data|Formatting|GHC|Lens|Network|Numeric|Options|Prettyprinter|System|Text)\>
-        - match: ^(Test.Gen.Cardano.Api)\>
-        - match: ^(Test.Cardano|Test.Gen.Cardano)\>
-        - match: ^(Hedgehog|HaskellWorks.Hspec|Test)\>
-
-  - language_pragmas:
-      style: vertical
-
-      align: false
-
-      # Principle 5
-      remove_redundant: true
-
-      # Principle 6
-      language_prefix: LANGUAGE
-
-  # Principle 7
-  - trailing_whitespace: {}
-
-# Principle 8
-columns: 100
-
-newline: native
-
-# Principle 9
-#
-# These syntax-affecting language extensions are enabled so that
-# stylish-haskell wouldn't fail with parsing errors when processing files
-# in projects that have those extensions enabled in the .cabal file
-# rather than locally.
-#
-# In particular language extensions with British and American spellings
-# that we use should be included here until stylish-haskell supports
-# the British spelling.
-language_extensions:
-  - BangPatterns
-  - ConstraintKinds
-  - DataKinds
-  - DefaultSignatures
-  - DeriveDataTypeable
-  - DeriveGeneric
-  - ExistentialQuantification
-  - FlexibleContexts
-  - FlexibleInstances
-  - FunctionalDependencies
-  - GADTs
-  - GeneralizedNewtypeDeriving
-  - LambdaCase
-  - MultiParamTypeClasses
-  - MultiWayIf
-  - OverloadedStrings
-  - PolyKinds
-  - RecordWildCards
-  - ScopedTypeVariables
-  - StandaloneDeriving
-  - TemplateHaskell
-  - TupleSections
-  - TypeApplications
-  - TypeFamilies
-  - ViewPatterns
-  - ExplicitNamespaces
-
-cabal: true
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
index f7ac316a6d..16c09b97fc 100644
--- a/cardano-cli/cardano-cli.cabal
+++ b/cardano-cli/cardano-cli.cabal
@@ -20,7 +20,10 @@ extra-source-files: README.md
 
 common project-config
   default-language: Haskell2010
-  default-extensions: OverloadedStrings
+  default-extensions:
+    ImportQualifiedPost
+    OverloadedStrings
+
   build-depends: base >=4.14 && <4.21
   ghc-options:
     -Wall
diff --git a/cardano-cli/src/Cardano/CLI/Byron/Commands.hs b/cardano-cli/src/Cardano/CLI/Byron/Commands.hs
index 1bf4e06bc8..8eacf0ea71 100644
--- a/cardano-cli/src/Cardano/CLI/Byron/Commands.hs
+++ b/cardano-cli/src/Cardano/CLI/Byron/Commands.hs
@@ -11,15 +11,15 @@ module Cardano.CLI.Byron.Commands
   )
 where
 
-import           Cardano.Api hiding (GenesisParameters)
-import qualified Cardano.Api.Byron as Byron
+import Cardano.Api hiding (GenesisParameters)
+import Cardano.Api.Byron qualified as Byron
 
-import           Cardano.CLI.Byron.Genesis
-import           Cardano.CLI.Byron.Key
-import           Cardano.CLI.Byron.Tx
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Byron.Genesis
+import Cardano.CLI.Byron.Key
+import Cardano.CLI.Byron.Tx
+import Cardano.CLI.Types.Common
 
-import           Data.String (IsString)
+import Data.String (IsString)
 
 data ByronCommand
   = --- Node Related Commands ---
diff --git a/cardano-cli/src/Cardano/CLI/Byron/Delegation.hs b/cardano-cli/src/Cardano/CLI/Byron/Delegation.hs
index bbd64013f7..221aceef9c 100644
--- a/cardano-cli/src/Cardano/CLI/Byron/Delegation.hs
+++ b/cardano-cli/src/Cardano/CLI/Byron/Delegation.hs
@@ -13,24 +13,24 @@ module Cardano.CLI.Byron.Delegation
   )
 where
 
-import           Cardano.Api.Byron (ACertificate (delegateVK))
-import           Cardano.Api.Byron hiding (delegateVK)
-import qualified Cardano.Api.Ledger as L
-
-import           Cardano.CLI.Byron.Key (ByronKeyFailure, renderByronKeyFailure)
-import           Cardano.CLI.Types.Common (CertificateFile (..))
-import           Cardano.Crypto (ProtocolMagicId)
-import qualified Cardano.Crypto as Crypto
-import           Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)
-
-import           Prelude hiding ((.))
-
-import           Control.Category
-import           Control.Monad (unless)
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString.Lazy as LB
-import           Data.Text (Text)
-import           Formatting (Format, sformat)
+import Cardano.Api.Byron (ACertificate (delegateVK))
+import Cardano.Api.Byron hiding (delegateVK)
+import Cardano.Api.Ledger qualified as L
+
+import Cardano.CLI.Byron.Key (ByronKeyFailure, renderByronKeyFailure)
+import Cardano.CLI.Types.Common (CertificateFile (..))
+import Cardano.Crypto (ProtocolMagicId)
+import Cardano.Crypto qualified as Crypto
+import Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)
+
+import Prelude hiding ((.))
+
+import Control.Category
+import Control.Monad (unless)
+import Data.ByteString (ByteString)
+import Data.ByteString.Lazy qualified as LB
+import Data.Text (Text)
+import Formatting (Format, sformat)
 
 data ByronDelegationError
   = CertificateValidationErrors !FilePath ![Text]
diff --git a/cardano-cli/src/Cardano/CLI/Byron/Genesis.hs b/cardano-cli/src/Cardano/CLI/Byron/Genesis.hs
index 0b19f95671..172f9f42a5 100644
--- a/cardano-cli/src/Cardano/CLI/Byron/Genesis.hs
+++ b/cardano-cli/src/Cardano/CLI/Byron/Genesis.hs
@@ -12,33 +12,37 @@ module Cardano.CLI.Byron.Genesis
   )
 where
 
-import           Cardano.Api (Doc, Key (..), NetworkId, pretty, pshow, writeSecrets)
-import           Cardano.Api.Byron (ByronKey, SerialiseAsRawBytes (..), SigningKey (..),
-                   toByronRequiresNetworkMagic)
-import qualified Cardano.Api.Byron as Byron
-
-import           Cardano.CLI.Byron.Delegation
-import           Cardano.CLI.Byron.Key
-import           Cardano.CLI.Types.Common (GenesisFile (..))
-import qualified Cardano.Crypto as Crypto
-import           Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)
-
-import           Control.Monad.IO.Class
-import           Control.Monad.Trans (MonadTrans (..))
-import           Control.Monad.Trans.Except (ExceptT (..), withExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, left, right)
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString.Lazy as LB
-import qualified Data.List as List
-import qualified Data.Map.Strict as Map
-import           Data.String (IsString)
-import           Data.Text (Text)
-import qualified Data.Text.Encoding as Text
-import           Data.Text.Lazy (toStrict)
-import           Data.Text.Lazy.Builder (toLazyText)
-import           Data.Time (UTCTime)
-import           Formatting.Buildable
-import           System.Directory (createDirectory, doesPathExist)
+import Cardano.Api (Doc, Key (..), NetworkId, pretty, pshow, writeSecrets)
+import Cardano.Api.Byron
+  ( ByronKey
+  , SerialiseAsRawBytes (..)
+  , SigningKey (..)
+  , toByronRequiresNetworkMagic
+  )
+import Cardano.Api.Byron qualified as Byron
+
+import Cardano.CLI.Byron.Delegation
+import Cardano.CLI.Byron.Key
+import Cardano.CLI.Types.Common (GenesisFile (..))
+import Cardano.Crypto qualified as Crypto
+import Cardano.Prelude (canonicalDecodePretty, canonicalEncodePretty)
+
+import Control.Monad.IO.Class
+import Control.Monad.Trans (MonadTrans (..))
+import Control.Monad.Trans.Except (ExceptT (..), withExceptT)
+import Control.Monad.Trans.Except.Extra (firstExceptT, left, right)
+import Data.ByteString (ByteString)
+import Data.ByteString.Lazy qualified as LB
+import Data.List qualified as List
+import Data.Map.Strict qualified as Map
+import Data.String (IsString)
+import Data.Text (Text)
+import Data.Text.Encoding qualified as Text
+import Data.Text.Lazy (toStrict)
+import Data.Text.Lazy.Builder (toLazyText)
+import Data.Time (UTCTime)
+import Formatting.Buildable
+import System.Directory (createDirectory, doesPathExist)
 
 data ByronGenesisError
   = ByronDelegationCertSerializationError !ByronDelegationError
diff --git a/cardano-cli/src/Cardano/CLI/Byron/Key.hs b/cardano-cli/src/Cardano/CLI/Byron/Key.hs
index d439619373..1a67b7040b 100644
--- a/cardano-cli/src/Cardano/CLI/Byron/Key.hs
+++ b/cardano-cli/src/Cardano/CLI/Byron/Key.hs
@@ -16,18 +16,18 @@ module Cardano.CLI.Byron.Key
   )
 where
 
-import           Cardano.Api.Byron
+import Cardano.Api.Byron
 
-import           Cardano.CLI.Types.Common
-import qualified Cardano.Crypto.Signing as Crypto
+import Cardano.CLI.Types.Common
+import Cardano.Crypto.Signing qualified as Crypto
 
-import           Control.Exception (Exception (..))
-import qualified Data.ByteString as SB
-import qualified Data.ByteString.UTF8 as UTF8
-import           Data.String (IsString, fromString)
-import           Data.Text (Text)
-import qualified Data.Text as T
-import           Formatting (build, sformat, (%))
+import Control.Exception (Exception (..))
+import Data.ByteString qualified as SB
+import Data.ByteString.UTF8 qualified as UTF8
+import Data.String (IsString, fromString)
+import Data.Text (Text)
+import Data.Text qualified as T
+import Formatting (build, sformat, (%))
 
 data ByronKeyFailure
   = ReadSigningKeyFailure !FilePath !Text
diff --git a/cardano-cli/src/Cardano/CLI/Byron/Legacy.hs b/cardano-cli/src/Cardano/CLI/Byron/Legacy.hs
index e4925063b6..a1cb2b8635 100644
--- a/cardano-cli/src/Cardano/CLI/Byron/Legacy.hs
+++ b/cardano-cli/src/Cardano/CLI/Byron/Legacy.hs
@@ -10,16 +10,16 @@ module Cardano.CLI.Byron.Legacy
   )
 where
 
-import           Cardano.Api (textShow)
+import Cardano.Api (textShow)
 
-import           Cardano.Crypto.Signing (SigningKey (..))
-import qualified Cardano.Crypto.Wallet as Wallet
+import Cardano.Crypto.Signing (SigningKey (..))
+import Cardano.Crypto.Wallet qualified as Wallet
 
-import qualified Codec.CBOR.Decoding as D
-import qualified Codec.CBOR.Encoding as E
-import           Control.Monad (when)
-import           Data.Text (Text)
-import           Formatting (build, formatToString)
+import Codec.CBOR.Decoding qualified as D
+import Codec.CBOR.Encoding qualified as E
+import Control.Monad (when)
+import Data.Text (Text)
+import Formatting (build, formatToString)
 
 -- | LegacyDelegateKey is a subset of the UserSecret's from the legacy codebase:
 -- 1. the VSS keypair must be present
diff --git a/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs b/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs
index 67bfbeda5e..47fc8ffb1a 100644
--- a/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs
+++ b/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs
@@ -24,42 +24,45 @@ module Cardano.CLI.Byron.Parsers
   )
 where
 
-import           Cardano.Api hiding (GenesisParameters, UpdateProposal)
-import           Cardano.Api.Byron (ByronProtocolParametersUpdate (..), toByronLovelace)
-import qualified Cardano.Api.Byron as Byron
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley (ReferenceScript (ReferenceScriptNone))
-
-import           Cardano.CLI.Byron.Commands
-import           Cardano.CLI.Byron.Genesis
-import           Cardano.CLI.Byron.Key
-import           Cardano.CLI.Byron.Tx
-import           Cardano.CLI.Environment (EnvCli (..))
-import           Cardano.CLI.EraBased.Options.Common hiding (parseLovelace, parseTxIn)
-import           Cardano.CLI.Run (ClientCommand (ByronCommand))
-import           Cardano.CLI.Types.Common
-import           Cardano.Crypto (RequiresNetworkMagic (..))
-import           Cardano.Crypto.Hashing (hashRaw)
-import           Cardano.Crypto.ProtocolMagic (AProtocolMagic (..), ProtocolMagic,
-                   ProtocolMagicId (..))
-
-import           Control.Monad (when)
-import qualified Data.Attoparsec.ByteString.Char8 as Atto
-import           Data.Attoparsec.Combinator ((<?>))
-import qualified Data.ByteString.Char8 as BSC
-import qualified Data.ByteString.Lazy.Char8 as C8
-import qualified Data.Char as Char
-import           Data.Foldable
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import           Data.Time (UTCTime)
-import           Data.Time.Clock.POSIX (posixSecondsToUTCTime)
-import           Data.Word (Word16, Word64)
-import           Formatting (build, sformat)
-import           GHC.Natural (Natural)
-import           GHC.Word (Word8)
-import           Options.Applicative
-import qualified Options.Applicative as Opt
+import Cardano.Api hiding (GenesisParameters, UpdateProposal)
+import Cardano.Api.Byron (ByronProtocolParametersUpdate (..), toByronLovelace)
+import Cardano.Api.Byron qualified as Byron
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley (ReferenceScript (ReferenceScriptNone))
+
+import Cardano.CLI.Byron.Commands
+import Cardano.CLI.Byron.Genesis
+import Cardano.CLI.Byron.Key
+import Cardano.CLI.Byron.Tx
+import Cardano.CLI.Environment (EnvCli (..))
+import Cardano.CLI.EraBased.Options.Common hiding (parseLovelace, parseTxIn)
+import Cardano.CLI.Run (ClientCommand (ByronCommand))
+import Cardano.CLI.Types.Common
+import Cardano.Crypto (RequiresNetworkMagic (..))
+import Cardano.Crypto.Hashing (hashRaw)
+import Cardano.Crypto.ProtocolMagic
+  ( AProtocolMagic (..)
+  , ProtocolMagic
+  , ProtocolMagicId (..)
+  )
+
+import Control.Monad (when)
+import Data.Attoparsec.ByteString.Char8 qualified as Atto
+import Data.Attoparsec.Combinator ((<?>))
+import Data.ByteString.Char8 qualified as BSC
+import Data.ByteString.Lazy.Char8 qualified as C8
+import Data.Char qualified as Char
+import Data.Foldable
+import Data.Text (Text)
+import Data.Text qualified as Text
+import Data.Time (UTCTime)
+import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
+import Data.Word (Word16, Word64)
+import Formatting (build, sformat)
+import GHC.Natural (Natural)
+import GHC.Word (Word8)
+import Options.Applicative
+import Options.Applicative qualified as Opt
 
 backwardsCompatibilityCommands :: EnvCli -> Parser ClientCommand
 backwardsCompatibilityCommands envCli =
diff --git a/cardano-cli/src/Cardano/CLI/Byron/Run.hs b/cardano-cli/src/Cardano/CLI/Byron/Run.hs
index e24ccd27ae..5d78ac4190 100644
--- a/cardano-cli/src/Cardano/CLI/Byron/Run.hs
+++ b/cardano-cli/src/Cardano/CLI/Byron/Run.hs
@@ -9,29 +9,29 @@ module Cardano.CLI.Byron.Run
   )
 where
 
-import           Cardano.Api hiding (GenesisParameters, UpdateProposal)
-import           Cardano.Api.Byron (SomeByronSigningKey (..), serializeByronTx)
-import qualified Cardano.Api.Byron as Byron
-
-import           Cardano.CLI.Byron.Commands
-import           Cardano.CLI.Byron.Delegation
-import           Cardano.CLI.Byron.Genesis
-import           Cardano.CLI.Byron.Key
-import           Cardano.CLI.Byron.Tx
-import           Cardano.CLI.Byron.UpdateProposal
-import           Cardano.CLI.Byron.Vote
-import           Cardano.CLI.Helpers
-import           Cardano.CLI.Types.Common
-import qualified Cardano.Crypto.Hashing as Crypto
-import qualified Cardano.Crypto.Signing as Crypto
-
-import           Data.Bifunctor (Bifunctor (..))
-import qualified Data.ByteString.Char8 as BS
-import           Data.Text (Text)
-import qualified Data.Text.IO as Text
-import qualified Data.Text.Lazy.Builder as Builder
-import qualified Data.Text.Lazy.IO as TL
-import qualified Formatting as F
+import Cardano.Api hiding (GenesisParameters, UpdateProposal)
+import Cardano.Api.Byron (SomeByronSigningKey (..), serializeByronTx)
+import Cardano.Api.Byron qualified as Byron
+
+import Cardano.CLI.Byron.Commands
+import Cardano.CLI.Byron.Delegation
+import Cardano.CLI.Byron.Genesis
+import Cardano.CLI.Byron.Key
+import Cardano.CLI.Byron.Tx
+import Cardano.CLI.Byron.UpdateProposal
+import Cardano.CLI.Byron.Vote
+import Cardano.CLI.Helpers
+import Cardano.CLI.Types.Common
+import Cardano.Crypto.Hashing qualified as Crypto
+import Cardano.Crypto.Signing qualified as Crypto
+
+import Data.Bifunctor (Bifunctor (..))
+import Data.ByteString.Char8 qualified as BS
+import Data.Text (Text)
+import Data.Text.IO qualified as Text
+import Data.Text.Lazy.Builder qualified as Builder
+import Data.Text.Lazy.IO qualified as TL
+import Formatting qualified as F
 
 -- | Data type that encompasses all the possible errors of the
 -- Byron client.
diff --git a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs
index eeba6ff75e..9cbfba9ae5 100644
--- a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs
+++ b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs
@@ -23,32 +23,32 @@ module Cardano.CLI.Byron.Tx
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Byron as Byron
-import           Cardano.Api.Consensus (ByronBlock, EraMismatch (..), GenTx (..))
-import qualified Cardano.Api.Consensus as Byron
-import qualified Cardano.Api.Ledger as L
-import qualified Cardano.Api.Network as Net.Tx
-
-import qualified Cardano.Binary as Binary
-import           Cardano.CLI.Byron.Key (byronWitnessToVerKey)
-import           Cardano.CLI.Types.Common (TxFile)
-import qualified Cardano.Crypto.Signing as Crypto
-
-import           Data.Bifunctor (Bifunctor (..))
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString as B
-import qualified Data.ByteString.Lazy as LB
-import qualified Data.List as List
-import           Data.Map.Strict (Map)
-import qualified Data.Map.Strict as Map
-import           Data.Maybe (fromMaybe, mapMaybe)
-import           Data.String (IsString)
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import qualified Data.Text.IO as Text
-import           Formatting (sformat, (%))
-import           GHC.Exts (IsList (..))
+import Cardano.Api
+import Cardano.Api.Byron qualified as Byron
+import Cardano.Api.Consensus (ByronBlock, EraMismatch (..), GenTx (..))
+import Cardano.Api.Consensus qualified as Byron
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Network qualified as Net.Tx
+
+import Cardano.Binary qualified as Binary
+import Cardano.CLI.Byron.Key (byronWitnessToVerKey)
+import Cardano.CLI.Types.Common (TxFile)
+import Cardano.Crypto.Signing qualified as Crypto
+
+import Data.Bifunctor (Bifunctor (..))
+import Data.ByteString (ByteString)
+import Data.ByteString qualified as B
+import Data.ByteString.Lazy qualified as LB
+import Data.List qualified as List
+import Data.Map.Strict (Map)
+import Data.Map.Strict qualified as Map
+import Data.Maybe (fromMaybe, mapMaybe)
+import Data.String (IsString)
+import Data.Text (Text)
+import Data.Text qualified as Text
+import Data.Text.IO qualified as Text
+import Formatting (sformat, (%))
+import GHC.Exts (IsList (..))
 
 data ByronTxError
   = TxDeserialisationFailed !FilePath !Binary.DecoderError
diff --git a/cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs b/cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs
index e8460df40b..ddc03117de 100644
--- a/cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs
+++ b/cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs
@@ -11,24 +11,29 @@ module Cardano.CLI.Byron.UpdateProposal
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Byron (AsType (AsByronUpdateProposal), ByronProtocolParametersUpdate,
-                   ByronUpdateProposal, makeByronUpdateProposal, toByronLedgerUpdateProposal)
-import qualified Cardano.Api.Byron as Byron
-import           Cardano.Api.Consensus (condense, txId)
+import Cardano.Api
+import Cardano.Api.Byron
+  ( AsType (AsByronUpdateProposal)
+  , ByronProtocolParametersUpdate
+  , ByronUpdateProposal
+  , makeByronUpdateProposal
+  , toByronLedgerUpdateProposal
+  )
+import Cardano.Api.Byron qualified as Byron
+import Cardano.Api.Consensus (condense, txId)
 
-import           Cardano.CLI.Byron.Genesis (ByronGenesisError)
-import           Cardano.CLI.Byron.Key (ByronKeyFailure, readByronSigningKey)
-import           Cardano.CLI.Byron.Tx (ByronTxError, nodeSubmitTx)
-import           Cardano.CLI.Helpers (HelpersError, ensureNewFileLBS, renderHelpersError)
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Byron.Genesis (ByronGenesisError)
+import Cardano.CLI.Byron.Key (ByronKeyFailure, readByronSigningKey)
+import Cardano.CLI.Byron.Tx (ByronTxError, nodeSubmitTx)
+import Cardano.CLI.Helpers (HelpersError, ensureNewFileLBS, renderHelpersError)
+import Cardano.CLI.Types.Common
 
-import           Control.Exception (Exception (..))
-import           Control.Tracer (stdoutTracer, traceWith)
-import           Data.Bifunctor (Bifunctor (..))
-import qualified Data.ByteString as BS
-import           Data.Text (Text)
-import qualified Data.Text as Text
+import Control.Exception (Exception (..))
+import Control.Tracer (stdoutTracer, traceWith)
+import Data.Bifunctor (Bifunctor (..))
+import Data.ByteString qualified as BS
+import Data.Text (Text)
+import Data.Text qualified as Text
 
 data ByronUpdateProposalError
   = ByronReadUpdateProposalFileFailure !FilePath !Text
diff --git a/cardano-cli/src/Cardano/CLI/Byron/Vote.hs b/cardano-cli/src/Cardano/CLI/Byron/Vote.hs
index 3f0ed42528..7b24d825f5 100644
--- a/cardano-cli/src/Cardano/CLI/Byron/Vote.hs
+++ b/cardano-cli/src/Cardano/CLI/Byron/Vote.hs
@@ -11,22 +11,24 @@ module Cardano.CLI.Byron.Vote
   )
 where
 
-import           Cardano.Api.Byron
-import           Cardano.Api.Consensus (condense, txId)
+import Cardano.Api.Byron
+import Cardano.Api.Consensus (condense, txId)
 
-import qualified Cardano.Binary as Binary
-import           Cardano.CLI.Byron.Genesis (ByronGenesisError)
-import           Cardano.CLI.Byron.Key (ByronKeyFailure, readByronSigningKey)
-import           Cardano.CLI.Byron.Tx (ByronTxError, nodeSubmitTx)
-import           Cardano.CLI.Byron.UpdateProposal (ByronUpdateProposalError,
-                   readByronUpdateProposal)
-import           Cardano.CLI.Helpers (HelpersError, ensureNewFileLBS)
-import           Cardano.CLI.Types.Common
+import Cardano.Binary qualified as Binary
+import Cardano.CLI.Byron.Genesis (ByronGenesisError)
+import Cardano.CLI.Byron.Key (ByronKeyFailure, readByronSigningKey)
+import Cardano.CLI.Byron.Tx (ByronTxError, nodeSubmitTx)
+import Cardano.CLI.Byron.UpdateProposal
+  ( ByronUpdateProposalError
+  , readByronUpdateProposal
+  )
+import Cardano.CLI.Helpers (HelpersError, ensureNewFileLBS)
+import Cardano.CLI.Types.Common
 
-import           Control.Tracer (stdoutTracer, traceWith)
-import           Data.Bifunctor (first)
-import qualified Data.ByteString as BS
-import           Data.Text (Text)
+import Control.Tracer (stdoutTracer, traceWith)
+import Data.Bifunctor (first)
+import Data.ByteString qualified as BS
+import Data.Text (Text)
 
 data ByronVoteError
   = ByronVoteDecodingError !FilePath
diff --git a/cardano-cli/src/Cardano/CLI/Commands.hs b/cardano-cli/src/Cardano/CLI/Commands.hs
index 8c773631ae..fd0c891d4a 100644
--- a/cardano-cli/src/Cardano/CLI/Commands.hs
+++ b/cardano-cli/src/Cardano/CLI/Commands.hs
@@ -5,19 +5,19 @@ module Cardano.CLI.Commands
   )
 where
 
-import           Cardano.CLI.Byron.Commands (ByronCommand)
-import           Cardano.CLI.Commands.Address
-import           Cardano.CLI.Commands.Debug
-import           Cardano.CLI.Commands.Hash (HashCmds)
-import           Cardano.CLI.Commands.Key
-import           Cardano.CLI.Commands.Node
-import           Cardano.CLI.Commands.Ping (PingCmd)
-import           Cardano.CLI.Compatible.Commands
-import           Cardano.CLI.EraBased.Commands.Query
-import           Cardano.CLI.EraBased.Commands.TopLevelCommands
-import           Cardano.CLI.Legacy.Commands
+import Cardano.CLI.Byron.Commands (ByronCommand)
+import Cardano.CLI.Commands.Address
+import Cardano.CLI.Commands.Debug
+import Cardano.CLI.Commands.Hash (HashCmds)
+import Cardano.CLI.Commands.Key
+import Cardano.CLI.Commands.Node
+import Cardano.CLI.Commands.Ping (PingCmd)
+import Cardano.CLI.Compatible.Commands
+import Cardano.CLI.EraBased.Commands.Query
+import Cardano.CLI.EraBased.Commands.TopLevelCommands
+import Cardano.CLI.Legacy.Commands
 
-import           Options.Applicative.Types (ParserInfo (..), ParserPrefs (..))
+import Options.Applicative.Types (ParserInfo (..), ParserPrefs (..))
 
 -- | Sub-commands of 'cardano-cli'.
 data ClientCommand
diff --git a/cardano-cli/src/Cardano/CLI/Commands/Address.hs b/cardano-cli/src/Cardano/CLI/Commands/Address.hs
index 76b4c0ccb3..ce21dec774 100644
--- a/cardano-cli/src/Cardano/CLI/Commands/Address.hs
+++ b/cardano-cli/src/Cardano/CLI/Commands/Address.hs
@@ -7,14 +7,14 @@ module Cardano.CLI.Commands.Address
   )
 where
 
-import           Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
+import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
 
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Key
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Key
 
-import           Prelude
+import Prelude
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data AddressCmds
   = AddressKeyGen
diff --git a/cardano-cli/src/Cardano/CLI/Commands/Debug.hs b/cardano-cli/src/Cardano/CLI/Commands/Debug.hs
index a2209d27c7..5448739816 100644
--- a/cardano-cli/src/Cardano/CLI/Commands/Debug.hs
+++ b/cardano-cli/src/Cardano/CLI/Commands/Debug.hs
@@ -3,9 +3,9 @@ module Cardano.CLI.Commands.Debug
   )
 where
 
-import           Cardano.CLI.Commands.Debug.CheckNodeConfiguration
-import           Cardano.CLI.Commands.Debug.LogEpochState
-import           Cardano.CLI.Commands.Debug.TransactionView
+import Cardano.CLI.Commands.Debug.CheckNodeConfiguration
+import Cardano.CLI.Commands.Debug.LogEpochState
+import Cardano.CLI.Commands.Debug.TransactionView
 
 data DebugCmds
   = DebugCheckNodeConfigurationCmd CheckNodeConfigCmdArgs
diff --git a/cardano-cli/src/Cardano/CLI/Commands/Debug/CheckNodeConfiguration.hs b/cardano-cli/src/Cardano/CLI/Commands/Debug/CheckNodeConfiguration.hs
index 7aeb79dd4b..d74dc623b1 100644
--- a/cardano-cli/src/Cardano/CLI/Commands/Debug/CheckNodeConfiguration.hs
+++ b/cardano-cli/src/Cardano/CLI/Commands/Debug/CheckNodeConfiguration.hs
@@ -2,7 +2,7 @@
 
 module Cardano.CLI.Commands.Debug.CheckNodeConfiguration where
 
-import           Cardano.Api
+import Cardano.Api
 
 -- | Argument for the 'debug check-node-configuration' command.
 newtype CheckNodeConfigCmdArgs = CheckNodeConfigCmdArgs (NodeConfigFile 'In)
diff --git a/cardano-cli/src/Cardano/CLI/Commands/Debug/LogEpochState.hs b/cardano-cli/src/Cardano/CLI/Commands/Debug/LogEpochState.hs
index 90e7f07fd5..30ad067c95 100644
--- a/cardano-cli/src/Cardano/CLI/Commands/Debug/LogEpochState.hs
+++ b/cardano-cli/src/Cardano/CLI/Commands/Debug/LogEpochState.hs
@@ -6,9 +6,9 @@ module Cardano.CLI.Commands.Debug.LogEpochState
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Orphans ()
+import Cardano.CLI.Orphans ()
 
 -- | A phantom type to represent the configuration file.
 data Configuration
diff --git a/cardano-cli/src/Cardano/CLI/Commands/Debug/TransactionView.hs b/cardano-cli/src/Cardano/CLI/Commands/Debug/TransactionView.hs
index 5fd6849f02..1faa8988a4 100644
--- a/cardano-cli/src/Cardano/CLI/Commands/Debug/TransactionView.hs
+++ b/cardano-cli/src/Cardano/CLI/Commands/Debug/TransactionView.hs
@@ -2,7 +2,7 @@
 
 module Cardano.CLI.Commands.Debug.TransactionView where
 
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Common
 
 data TransactionViewCmdArgs = TransactionViewCmdArgs
   { outputFormat :: !ViewOutputFormat
diff --git a/cardano-cli/src/Cardano/CLI/Commands/Hash.hs b/cardano-cli/src/Cardano/CLI/Commands/Hash.hs
index 0bd964d98b..4a071162ec 100644
--- a/cardano-cli/src/Cardano/CLI/Commands/Hash.hs
+++ b/cardano-cli/src/Cardano/CLI/Commands/Hash.hs
@@ -13,12 +13,12 @@ module Cardano.CLI.Commands.Hash
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
 
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Common
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data HashCmds
   = HashAnchorDataCmd !HashAnchorDataCmdArgs
diff --git a/cardano-cli/src/Cardano/CLI/Commands/Key.hs b/cardano-cli/src/Cardano/CLI/Commands/Key.hs
index 413cc24ab5..0e76c51e17 100644
--- a/cardano-cli/src/Cardano/CLI/Commands/Key.hs
+++ b/cardano-cli/src/Cardano/CLI/Commands/Key.hs
@@ -16,11 +16,11 @@ module Cardano.CLI.Commands.Key
   )
 where
 
-import           Cardano.Api.Shelley
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Common
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data KeyCmds
   = KeyVerificationKeyCmd !KeyVerificationKeyCmdArgs
diff --git a/cardano-cli/src/Cardano/CLI/Commands/Node.hs b/cardano-cli/src/Cardano/CLI/Commands/Node.hs
index 2427cb4780..a66e113588 100644
--- a/cardano-cli/src/Cardano/CLI/Commands/Node.hs
+++ b/cardano-cli/src/Cardano/CLI/Commands/Node.hs
@@ -14,12 +14,12 @@ module Cardano.CLI.Commands.Node
   )
 where
 
-import           Cardano.Api.Shelley
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Key
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Key
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data NodeCmds
   = NodeKeyGenColdCmd !NodeKeyGenColdCmdArgs
diff --git a/cardano-cli/src/Cardano/CLI/Commands/Ping.hs b/cardano-cli/src/Cardano/CLI/Commands/Ping.hs
index d873825ab9..f0680da349 100644
--- a/cardano-cli/src/Cardano/CLI/Commands/Ping.hs
+++ b/cardano-cli/src/Cardano/CLI/Commands/Ping.hs
@@ -5,7 +5,7 @@ module Cardano.CLI.Commands.Ping
   )
 where
 
-import           Data.Word
+import Data.Word
 
 data EndPoint
   = HostEndPoint String
diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Commands.hs b/cardano-cli/src/Cardano/CLI/Compatible/Commands.hs
index 823b483b6c..6eb20fb5d4 100644
--- a/cardano-cli/src/Cardano/CLI/Compatible/Commands.hs
+++ b/cardano-cli/src/Cardano/CLI/Compatible/Commands.hs
@@ -15,17 +15,17 @@ module Cardano.CLI.Compatible.Commands
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Compatible.Governance
-import           Cardano.CLI.Compatible.Transaction
-import           Cardano.CLI.Environment
-import           Cardano.CLI.Parser
+import Cardano.CLI.Compatible.Governance
+import Cardano.CLI.Compatible.Transaction
+import Cardano.CLI.Environment
+import Cardano.CLI.Parser
 
-import           Data.Foldable
-import           Data.Text
-import           Options.Applicative
-import qualified Options.Applicative as Opt
+import Data.Foldable
+import Data.Text
+import Options.Applicative
+import Options.Applicative qualified as Opt
 
 data AnyCompatibleCommand where
   AnyCompatibleCommand :: CompatibleCommand era -> AnyCompatibleCommand
diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Governance.hs b/cardano-cli/src/Cardano/CLI/Compatible/Governance.hs
index c0ffad083c..c7e1ffbfb9 100644
--- a/cardano-cli/src/Cardano/CLI/Compatible/Governance.hs
+++ b/cardano-cli/src/Cardano/CLI/Compatible/Governance.hs
@@ -9,16 +9,16 @@ module Cardano.CLI.Compatible.Governance
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.EraBased.Options.Governance
-import           Cardano.CLI.EraBased.Run.Governance
-import           Cardano.CLI.Types.Errors.CmdError
+import Cardano.CLI.EraBased.Options.Governance
+import Cardano.CLI.EraBased.Run.Governance
+import Cardano.CLI.Types.Errors.CmdError
 
-import           Data.Foldable
-import           Data.Maybe
-import           Data.Text
-import           Options.Applicative
+import Data.Foldable
+import Data.Maybe
+import Data.Text
+import Options.Applicative
 
 pCompatibleGovernanceCmds :: ShelleyBasedEra era -> Parser (CompatibleGovernanceCmds era)
 pCompatibleGovernanceCmds sbe =
diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Run.hs b/cardano-cli/src/Cardano/CLI/Compatible/Run.hs
index ae30b50b10..6413a48224 100644
--- a/cardano-cli/src/Cardano/CLI/Compatible/Run.hs
+++ b/cardano-cli/src/Cardano/CLI/Compatible/Run.hs
@@ -8,15 +8,15 @@ module Cardano.CLI.Compatible.Run
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Compatible.Commands
-import           Cardano.CLI.Compatible.Governance
-import           Cardano.CLI.Compatible.Transaction
-import           Cardano.CLI.Render
-import           Cardano.CLI.Types.Errors.CmdError
+import Cardano.CLI.Compatible.Commands
+import Cardano.CLI.Compatible.Governance
+import Cardano.CLI.Compatible.Transaction
+import Cardano.CLI.Render
+import Cardano.CLI.Types.Errors.CmdError
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data CompatibleCmdError
   = CompatibleTransactionError CompatibleTransactionError
diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs b/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs
index 2b0b435e51..08c665c22b 100644
--- a/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs
+++ b/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs
@@ -14,37 +14,39 @@ module Cardano.CLI.Compatible.Transaction
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Compatible
-import           Cardano.Api.Ledger hiding (TxIn, VotingProcedures)
-import           Cardano.Api.Shelley hiding (VotingProcedures)
-
-import           Cardano.CLI.Environment
-import           Cardano.CLI.EraBased.Options.Common hiding (pRefScriptFp, pTxOutDatum)
-import           Cardano.CLI.EraBased.Run.Transaction
-import           Cardano.CLI.EraBased.Script.Certificate.Read
-import           Cardano.CLI.EraBased.Script.Certificate.Types
-import           Cardano.CLI.EraBased.Script.Proposal.Types
-import           Cardano.CLI.EraBased.Script.Types
-import           Cardano.CLI.EraBased.Script.Vote.Types (CliVoteScriptRequirements,
-                   VoteScriptWitness (..))
-import           Cardano.CLI.Parser
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.BootstrapWitnessError
-import           Cardano.CLI.Types.Errors.TxCmdError
-import           Cardano.CLI.Types.Governance
-import           Cardano.CLI.Types.TxFeature
-
-import           Data.Bifunctor (first)
-import           Data.Foldable hiding (toList)
-import           Data.Function
-import qualified Data.Map.Strict as Map
-import           Data.Maybe
-import           Data.Text (Text)
-import           GHC.Exts (toList)
-import           Options.Applicative
-import qualified Options.Applicative as Opt
+import Cardano.Api
+import Cardano.Api.Compatible
+import Cardano.Api.Ledger hiding (TxIn, VotingProcedures)
+import Cardano.Api.Shelley hiding (VotingProcedures)
+
+import Cardano.CLI.Environment
+import Cardano.CLI.EraBased.Options.Common hiding (pRefScriptFp, pTxOutDatum)
+import Cardano.CLI.EraBased.Run.Transaction
+import Cardano.CLI.EraBased.Script.Certificate.Read
+import Cardano.CLI.EraBased.Script.Certificate.Types
+import Cardano.CLI.EraBased.Script.Proposal.Types
+import Cardano.CLI.EraBased.Script.Types
+import Cardano.CLI.EraBased.Script.Vote.Types
+  ( CliVoteScriptRequirements
+  , VoteScriptWitness (..)
+  )
+import Cardano.CLI.Parser
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.BootstrapWitnessError
+import Cardano.CLI.Types.Errors.TxCmdError
+import Cardano.CLI.Types.Governance
+import Cardano.CLI.Types.TxFeature
+
+import Data.Bifunctor (first)
+import Data.Foldable hiding (toList)
+import Data.Function
+import Data.Map.Strict qualified as Map
+import Data.Maybe
+import Data.Text (Text)
+import GHC.Exts (toList)
+import Options.Applicative
+import Options.Applicative qualified as Opt
 
 pAllCompatibleTransactionCommands
   :: EnvCli -> ShelleyBasedEra era -> Parser (CompatibleTransactionCmds era)
diff --git a/cardano-cli/src/Cardano/CLI/Environment.hs b/cardano-cli/src/Cardano/CLI/Environment.hs
index 21a01a1ce8..88be80370a 100644
--- a/cardano-cli/src/Cardano/CLI/Environment.hs
+++ b/cardano-cli/src/Cardano/CLI/Environment.hs
@@ -11,14 +11,21 @@ module Cardano.CLI.Environment
   )
 where
 
-import           Cardano.Api (AnyCardanoEra (..), CardanoEra (..), Eon, EraInEon (..),
-                   NetworkId (..), NetworkMagic (..), forEraInEonMaybe)
+import Cardano.Api
+  ( AnyCardanoEra (..)
+  , CardanoEra (..)
+  , Eon
+  , EraInEon (..)
+  , NetworkId (..)
+  , NetworkMagic (..)
+  , forEraInEonMaybe
+  )
 
-import           Data.Typeable
-import           Data.Word (Word32)
-import qualified System.Environment as IO
-import qualified System.IO as IO
-import           Text.Read (readMaybe)
+import Data.Typeable
+import Data.Word (Word32)
+import System.Environment qualified as IO
+import System.IO qualified as IO
+import Text.Read (readMaybe)
 
 data EnvCli = EnvCli
   { envCliNetworkId :: Maybe NetworkId
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Genesis.hs
index bea18c357a..b51d2dadbb 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Genesis.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Genesis.hs
@@ -19,14 +19,14 @@ module Cardano.CLI.EraBased.Commands.Genesis
   )
 where
 
-import qualified Cardano.Api.Byron as Byron
-import qualified Cardano.Api.Experimental as Exp
-import           Cardano.Api.Ledger (Coin)
-import           Cardano.Api.Shelley
+import Cardano.Api.Byron qualified as Byron
+import Cardano.Api.Experimental qualified as Exp
+import Cardano.Api.Ledger (Coin)
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Common
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data GenesisCmds era
   = GenesisCreate !(GenesisCreateCmdArgs era)
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance.hs
index 468853f6cb..9f452842ff 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance.hs
@@ -8,18 +8,18 @@ module Cardano.CLI.EraBased.Commands.Governance
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Ledger (Coin)
-import           Cardano.Api.Shelley (VrfKey)
+import Cardano.Api
+import Cardano.Api.Ledger (Coin)
+import Cardano.Api.Shelley (VrfKey)
 
-import           Cardano.CLI.EraBased.Commands.Governance.Actions
-import           Cardano.CLI.EraBased.Commands.Governance.Committee
-import           Cardano.CLI.EraBased.Commands.Governance.DRep
-import           Cardano.CLI.EraBased.Commands.Governance.Poll
-import           Cardano.CLI.EraBased.Commands.Governance.Vote
-import           Cardano.CLI.Types.Key (VerificationKeyOrHashOrFile)
+import Cardano.CLI.EraBased.Commands.Governance.Actions
+import Cardano.CLI.EraBased.Commands.Governance.Committee
+import Cardano.CLI.EraBased.Commands.Governance.DRep
+import Cardano.CLI.EraBased.Commands.Governance.Poll
+import Cardano.CLI.EraBased.Commands.Governance.Vote
+import Cardano.CLI.Types.Key (VerificationKeyOrHashOrFile)
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data GovernanceCmds era
   = GovernanceCreateMirCertificateStakeAddressesCmd
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs
index 35d36107c3..27a475ecfb 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs
@@ -22,15 +22,15 @@ module Cardano.CLI.EraBased.Commands.Governance.Actions
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Key
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Key
 
-import           Data.Text (Text)
-import           Data.Word
+import Data.Text (Text)
+import Data.Word
 
 data GovernanceActionCmds era
   = GovernanceActionCreateConstitutionCmd !(GovernanceActionCreateConstitutionCmdArgs era)
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Committee.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Committee.hs
index f50503501e..7d3202c9d0 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Committee.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Committee.hs
@@ -13,15 +13,15 @@ module Cardano.CLI.EraBased.Commands.Governance.Committee
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common (PotentiallyCheckedAnchor, ResignationMetadataUrl)
-import           Cardano.CLI.Types.Key
-import           Cardano.CLI.Types.Key.VerificationKey
+import Cardano.CLI.Types.Common (PotentiallyCheckedAnchor, ResignationMetadataUrl)
+import Cardano.CLI.Types.Key
+import Cardano.CLI.Types.Key.VerificationKey
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data GovernanceCommitteeCmds era
   = GovernanceCommitteeKeyGenColdCmd
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs
index cfcf889b5f..f37e9256f3 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs
@@ -15,14 +15,14 @@ module Cardano.CLI.EraBased.Commands.Governance.DRep
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
 
-import           Cardano.CLI.Commands.Hash (HashGoal)
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Key
+import Cardano.CLI.Commands.Hash (HashGoal)
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Key
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data GovernanceDRepCmds era
   = GovernanceDRepKeyGenCmd !(GovernanceDRepKeyGenCmdArgs era)
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Poll.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Poll.hs
index 1b697a96b0..fa0ee367cb 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Poll.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Poll.hs
@@ -11,10 +11,10 @@ module Cardano.CLI.EraBased.Commands.Governance.Poll
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Shelley
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data GovernancePollCmds era
   = GovernanceCreatePoll !(GovernanceCreatePollCmdArgs era)
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Vote.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Vote.hs
index 05d379e1b5..f2480ee8f2 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Vote.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Vote.hs
@@ -11,14 +11,14 @@ module Cardano.CLI.EraBased.Commands.Governance.Vote
   )
 where
 
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Governance
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Governance
 
-import           Data.Text (Text)
-import           Data.Word
+import Data.Text (Text)
+import Data.Word
 
 data GovernanceVoteCmds era
   = GovernanceVoteCreateCmd
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs
index 0700241103..ab6ff2fe4d 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs
@@ -34,18 +34,18 @@ module Cardano.CLI.EraBased.Commands.Query
   )
 where
 
-import qualified Cardano.Api.Ledger as L
-import qualified Cardano.Api.Network as Consensus
-import           Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Network qualified as Consensus
+import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
 
-import           Cardano.CLI.Orphans ()
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Key
+import Cardano.CLI.Orphans ()
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Key
 
-import           Data.Set (Set)
-import           Data.Text (Text)
-import           Data.Time.Clock
-import           GHC.Generics
+import Data.Set (Set)
+import Data.Text (Text)
+import Data.Time.Clock
+import GHC.Generics
 
 data QueryCmds era
   = QueryLeadershipScheduleCmd !QueryLeadershipScheduleCmdArgs
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/StakeAddress.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/StakeAddress.hs
index 1f634398af..76a3a875a3 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/StakeAddress.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/StakeAddress.hs
@@ -7,16 +7,16 @@ module Cardano.CLI.EraBased.Commands.StakeAddress
   )
 where
 
-import           Cardano.Api.Ledger (Coin)
-import           Cardano.Api.Shelley
+import Cardano.Api.Ledger (Coin)
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Governance
-import           Cardano.CLI.Types.Key
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Governance
+import Cardano.CLI.Types.Key
 
-import           Prelude
+import Prelude
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data StakeAddressCmds era
   = StakeAddressKeyGenCmd
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/StakePool.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/StakePool.hs
index 17987288c2..f6f0fc1cf4 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/StakePool.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/StakePool.hs
@@ -13,17 +13,17 @@ module Cardano.CLI.EraBased.Commands.StakePool
   )
 where
 
-import           Cardano.Api.Ledger (Coin)
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
+import Cardano.Api.Ledger (Coin)
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
 
-import           Cardano.CLI.Commands.Hash (HashGoal)
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Key
+import Cardano.CLI.Commands.Hash (HashGoal)
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Key
 
-import           Prelude
+import Prelude
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data StakePoolCmds era
   = StakePoolDeregistrationCertificateCmd !(StakePoolDeregistrationCertificateCmdArgs era)
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/TextView.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/TextView.hs
index 6f9deefe0f..b2ed123869 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/TextView.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/TextView.hs
@@ -7,9 +7,9 @@ module Cardano.CLI.EraBased.Commands.TextView
   )
 where
 
-import           Cardano.Api.Shelley
+import Cardano.Api.Shelley
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data TextViewCmds era
   = TextViewInfo
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/TopLevelCommands.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/TopLevelCommands.hs
index a4b108f77f..627aa83c50 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/TopLevelCommands.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/TopLevelCommands.hs
@@ -9,21 +9,21 @@ module Cardano.CLI.EraBased.Commands.TopLevelCommands
   )
 where
 
-import           Cardano.Api (ShelleyBasedEra (..))
+import Cardano.Api (ShelleyBasedEra (..))
 
-import           Cardano.CLI.Commands.Address
-import           Cardano.CLI.Commands.Key
-import           Cardano.CLI.Commands.Node
-import           Cardano.CLI.EraBased.Commands.Genesis
-import           Cardano.CLI.EraBased.Commands.Query
-import           Cardano.CLI.EraBased.Commands.StakeAddress
-import           Cardano.CLI.EraBased.Commands.StakePool
-import           Cardano.CLI.EraBased.Commands.TextView
-import           Cardano.CLI.EraBased.Commands.Transaction
-import           Cardano.CLI.EraBased.Options.Governance (GovernanceCmds, renderGovernanceCmds)
+import Cardano.CLI.Commands.Address
+import Cardano.CLI.Commands.Key
+import Cardano.CLI.Commands.Node
+import Cardano.CLI.EraBased.Commands.Genesis
+import Cardano.CLI.EraBased.Commands.Query
+import Cardano.CLI.EraBased.Commands.StakeAddress
+import Cardano.CLI.EraBased.Commands.StakePool
+import Cardano.CLI.EraBased.Commands.TextView
+import Cardano.CLI.EraBased.Commands.Transaction
+import Cardano.CLI.EraBased.Options.Governance (GovernanceCmds, renderGovernanceCmds)
 
-import           Data.Text (Text)
-import           Data.Typeable (Typeable)
+import Data.Text (Text)
+import Data.Typeable (Typeable)
 
 data AnyEraCommand where
   AnyEraCommandOf :: Typeable era => ShelleyBasedEra era -> Cmds era -> AnyEraCommand
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs
index ad60152999..5672312470 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs
@@ -22,21 +22,21 @@ module Cardano.CLI.EraBased.Commands.Transaction
   )
 where
 
-import qualified Cardano.Api.Experimental as Exp
-import           Cardano.Api.Ledger (Coin)
-import           Cardano.Api.Shelley
+import Cardano.Api.Experimental qualified as Exp
+import Cardano.Api.Ledger (Coin)
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.EraBased.Script.Certificate.Types (CliCertificateScriptRequirements)
-import           Cardano.CLI.EraBased.Script.Mint.Types
-import           Cardano.CLI.EraBased.Script.Proposal.Types (CliProposalScriptRequirements)
-import           Cardano.CLI.EraBased.Script.Spend.Types (CliSpendScriptRequirements)
-import           Cardano.CLI.EraBased.Script.Vote.Types
-import           Cardano.CLI.EraBased.Script.Withdrawal.Types
-import           Cardano.CLI.Orphans ()
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Governance
+import Cardano.CLI.EraBased.Script.Certificate.Types (CliCertificateScriptRequirements)
+import Cardano.CLI.EraBased.Script.Mint.Types
+import Cardano.CLI.EraBased.Script.Proposal.Types (CliProposalScriptRequirements)
+import Cardano.CLI.EraBased.Script.Spend.Types (CliSpendScriptRequirements)
+import Cardano.CLI.EraBased.Script.Vote.Types
+import Cardano.CLI.EraBased.Script.Withdrawal.Types
+import Cardano.CLI.Orphans ()
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Governance
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data TransactionCmds era
   = TransactionBuildRawCmd !(TransactionBuildRawCmdArgs era)
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
index 07393525c2..71c3e56a01 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
@@ -12,61 +12,61 @@
 
 module Cardano.CLI.EraBased.Options.Common where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-import qualified Cardano.Api.Network as Consensus
-import           Cardano.Api.Shelley
-
-import           Cardano.CLI.Environment (EnvCli (..), envCliAnyEon)
-import           Cardano.CLI.EraBased.Script.Certificate.Types (CliCertificateScriptRequirements)
-import qualified Cardano.CLI.EraBased.Script.Certificate.Types as Certifying
-import           Cardano.CLI.EraBased.Script.Mint.Types
-import           Cardano.CLI.EraBased.Script.Proposal.Types (CliProposalScriptRequirements)
-import qualified Cardano.CLI.EraBased.Script.Proposal.Types as Proposing
-import           Cardano.CLI.EraBased.Script.Spend.Types (CliSpendScriptRequirements)
-import qualified Cardano.CLI.EraBased.Script.Spend.Types as PlutusSpend
-import           Cardano.CLI.EraBased.Script.Vote.Types (CliVoteScriptRequirements)
-import qualified Cardano.CLI.EraBased.Script.Vote.Types as Voting
-import           Cardano.CLI.EraBased.Script.Withdrawal.Types (CliWithdrawalScriptRequirements)
-import qualified Cardano.CLI.EraBased.Script.Withdrawal.Types as Withdrawal
-import           Cardano.CLI.Parser
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Governance
-import           Cardano.CLI.Types.Key
-import           Cardano.CLI.Types.Key.VerificationKey
-
-import           Control.Monad (void, when)
-import qualified Data.Aeson as Aeson
-import           Data.Bifunctor
-import           Data.Bits (Bits, toIntegralSized)
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString.Base16 as B16
-import qualified Data.ByteString.Char8 as BSC
-import           Data.Data (Proxy (..), Typeable, typeRep)
-import           Data.Foldable
-import           Data.Functor (($>))
-import qualified Data.IP as IP
-import           Data.List.NonEmpty (NonEmpty)
-import           Data.Maybe
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import           Data.Time.Clock (UTCTime)
-import           Data.Time.Format (defaultTimeLocale, parseTimeOrError)
-import           Data.Word
-import           GHC.Exts (IsList (..))
-import           GHC.Natural (Natural)
-import           Network.Socket (PortNumber)
-import           Options.Applicative hiding (help, str)
-import qualified Options.Applicative as Opt
-import qualified Text.Parsec as Parsec
-import           Text.Parsec ((<?>))
-import qualified Text.Parsec.Error as Parsec
-import qualified Text.Parsec.Language as Parsec
-import qualified Text.Parsec.String as Parsec
-import qualified Text.Parsec.Token as Parsec
-import qualified Text.Read as Read
-import           Text.Read (readEither, readMaybe)
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Network qualified as Consensus
+import Cardano.Api.Shelley
+
+import Cardano.CLI.Environment (EnvCli (..), envCliAnyEon)
+import Cardano.CLI.EraBased.Script.Certificate.Types (CliCertificateScriptRequirements)
+import Cardano.CLI.EraBased.Script.Certificate.Types qualified as Certifying
+import Cardano.CLI.EraBased.Script.Mint.Types
+import Cardano.CLI.EraBased.Script.Proposal.Types (CliProposalScriptRequirements)
+import Cardano.CLI.EraBased.Script.Proposal.Types qualified as Proposing
+import Cardano.CLI.EraBased.Script.Spend.Types (CliSpendScriptRequirements)
+import Cardano.CLI.EraBased.Script.Spend.Types qualified as PlutusSpend
+import Cardano.CLI.EraBased.Script.Vote.Types (CliVoteScriptRequirements)
+import Cardano.CLI.EraBased.Script.Vote.Types qualified as Voting
+import Cardano.CLI.EraBased.Script.Withdrawal.Types (CliWithdrawalScriptRequirements)
+import Cardano.CLI.EraBased.Script.Withdrawal.Types qualified as Withdrawal
+import Cardano.CLI.Parser
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Governance
+import Cardano.CLI.Types.Key
+import Cardano.CLI.Types.Key.VerificationKey
+
+import Control.Monad (void, when)
+import Data.Aeson qualified as Aeson
+import Data.Bifunctor
+import Data.Bits (Bits, toIntegralSized)
+import Data.ByteString (ByteString)
+import Data.ByteString.Base16 qualified as B16
+import Data.ByteString.Char8 qualified as BSC
+import Data.Data (Proxy (..), Typeable, typeRep)
+import Data.Foldable
+import Data.Functor (($>))
+import Data.IP qualified as IP
+import Data.List.NonEmpty (NonEmpty)
+import Data.Maybe
+import Data.Text (Text)
+import Data.Text qualified as Text
+import Data.Time.Clock (UTCTime)
+import Data.Time.Format (defaultTimeLocale, parseTimeOrError)
+import Data.Word
+import GHC.Exts (IsList (..))
+import GHC.Natural (Natural)
+import Network.Socket (PortNumber)
+import Options.Applicative hiding (help, str)
+import Options.Applicative qualified as Opt
+import Text.Parsec ((<?>))
+import Text.Parsec qualified as Parsec
+import Text.Parsec.Error qualified as Parsec
+import Text.Parsec.Language qualified as Parsec
+import Text.Parsec.String qualified as Parsec
+import Text.Parsec.Token qualified as Parsec
+import Text.Read (readEither, readMaybe)
+import Text.Read qualified as Read
 
 command' :: String -> String -> Parser a -> Mod CommandFields a
 command' c descr p =
@@ -2011,12 +2011,11 @@ pTxIn sbe balance =
           <> Opt.metavar "TX-IN"
           <> Opt.help "TxId#TxIx"
       )
-    <*> ( optional
-            ( pPlutusReferenceSpendScriptWitness balance
-                <|> pSimpleReferenceSpendingScriptWitess
-                <|> pOnDiskSimpleOrPlutusScriptWitness
-            )
-        )
+    <*> optional
+      ( pPlutusReferenceSpendScriptWitness balance
+          <|> pSimpleReferenceSpendingScriptWitess
+          <|> pOnDiskSimpleOrPlutusScriptWitness
+      )
  where
   pSimpleReferenceSpendingScriptWitess :: Parser CliSpendScriptRequirements
   pSimpleReferenceSpendingScriptWitess =
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Era.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Era.hs
index cc262081c2..3870c9ed3d 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Era.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Era.hs
@@ -3,17 +3,17 @@ module Cardano.CLI.EraBased.Options.Era
   )
 where
 
-import           Cardano.Api (ShelleyBasedEra (..))
+import Cardano.Api (ShelleyBasedEra (..))
 
-import           Cardano.CLI.Environment
-import           Cardano.CLI.EraBased.Commands.TopLevelCommands
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.EraBased.Options.TopLevelCommands
-import           Cardano.CLI.Parser
+import Cardano.CLI.Environment
+import Cardano.CLI.EraBased.Commands.TopLevelCommands
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.EraBased.Options.TopLevelCommands
+import Cardano.CLI.Parser
 
-import           Data.Foldable
-import           Options.Applicative (Parser)
-import qualified Options.Applicative as Opt
+import Data.Foldable
+import Options.Applicative (Parser)
+import Options.Applicative qualified as Opt
 
 pAnyEraCommand :: EnvCli -> Parser AnyEraCommand
 pAnyEraCommand envCli =
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs
index 37ffaf00c9..717dfdc424 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs
@@ -9,21 +9,21 @@ module Cardano.CLI.EraBased.Options.Genesis
   )
 where
 
-import           Cardano.Api hiding (QueryInShelleyBasedEra (..))
-import qualified Cardano.Api.Byron as Byron
-import qualified Cardano.Api.Experimental as Exp
-import           Cardano.Api.Ledger (Coin (..))
-
-import           Cardano.CLI.Environment (EnvCli (..))
-import           Cardano.CLI.EraBased.Commands.Genesis
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
-import           Cardano.CLI.Types.Common
-
-import           Data.Maybe
-import           Data.Word (Word64)
-import           Options.Applicative hiding (help, str)
-import qualified Options.Applicative as Opt
+import Cardano.Api hiding (QueryInShelleyBasedEra (..))
+import Cardano.Api.Byron qualified as Byron
+import Cardano.Api.Experimental qualified as Exp
+import Cardano.Api.Ledger (Coin (..))
+
+import Cardano.CLI.Environment (EnvCli (..))
+import Cardano.CLI.EraBased.Commands.Genesis
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
+import Cardano.CLI.Types.Common
+
+import Data.Maybe
+import Data.Word (Word64)
+import Options.Applicative hiding (help, str)
+import Options.Applicative qualified as Opt
 
 pGenesisCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs
index 82237f6b1f..c623d85c2b 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs
@@ -8,20 +8,20 @@ module Cardano.CLI.EraBased.Options.Governance
   )
 where
 
-import           Cardano.Api (ShelleyBasedEra, ShelleyToBabbageEra, forShelleyBasedEraMaybeEon)
+import Cardano.Api (ShelleyBasedEra, ShelleyToBabbageEra, forShelleyBasedEraMaybeEon)
 
-import           Cardano.CLI.EraBased.Commands.Governance
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.EraBased.Options.Governance.Actions
-import           Cardano.CLI.EraBased.Options.Governance.Committee
-import           Cardano.CLI.EraBased.Options.Governance.DRep
-import           Cardano.CLI.EraBased.Options.Governance.Poll
-import           Cardano.CLI.EraBased.Options.Governance.Vote
-import           Cardano.CLI.Parser
+import Cardano.CLI.EraBased.Commands.Governance
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.EraBased.Options.Governance.Actions
+import Cardano.CLI.EraBased.Options.Governance.Committee
+import Cardano.CLI.EraBased.Options.Governance.DRep
+import Cardano.CLI.EraBased.Options.Governance.Poll
+import Cardano.CLI.EraBased.Options.Governance.Vote
+import Cardano.CLI.Parser
 
-import           Data.Foldable
-import           Options.Applicative
-import qualified Options.Applicative as Opt
+import Data.Foldable
+import Options.Applicative
+import Options.Applicative qualified as Opt
 
 -- First TODO: Change CardanoEra era to ShelleyBasedEra era
 -- Second TODO: Return Parser (GovernanceCmds era) because it's not possible
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs
index b08548f0a2..e8bfade68f 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs
@@ -7,19 +7,19 @@ module Cardano.CLI.EraBased.Options.Governance.Actions
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
-
-import qualified Cardano.CLI.EraBased.Commands.Governance.Actions as Cmd
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
-import           Cardano.CLI.Types.Common
-
-import           Data.Foldable
-import           GHC.Natural (Natural)
-import           Options.Applicative
-import qualified Options.Applicative as Opt
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
+
+import Cardano.CLI.EraBased.Commands.Governance.Actions qualified as Cmd
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
+import Cardano.CLI.Types.Common
+
+import Data.Foldable
+import GHC.Natural (Natural)
+import Options.Applicative
+import Options.Applicative qualified as Opt
 
 pGovernanceActionCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Committee.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Committee.hs
index d606f2980a..de83d0c833 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Committee.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Committee.hs
@@ -6,18 +6,18 @@ module Cardano.CLI.EraBased.Options.Governance.Committee
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
 
-import           Cardano.CLI.EraBased.Commands.Governance.Committee
-import           Cardano.CLI.EraBased.Options.Common hiding (pAnchorUrl)
-import           Cardano.CLI.Parser
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Key
+import Cardano.CLI.EraBased.Commands.Governance.Committee
+import Cardano.CLI.EraBased.Options.Common hiding (pAnchorUrl)
+import Cardano.CLI.Parser
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Key
 
-import           Data.Foldable (asum)
-import           Options.Applicative (Parser, optional)
-import qualified Options.Applicative as Opt
+import Data.Foldable (asum)
+import Options.Applicative (Parser, optional)
+import Options.Applicative qualified as Opt
 
 pGovernanceCommitteeCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs
index 919eb2b51a..59d02fdfcc 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs
@@ -1,7 +1,5 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE GADTs #-}
-{-# LANGUAGE LambdaCase #-}
-{-# OPTIONS_GHC -Wno-unused-imports #-}
 
 module Cardano.CLI.EraBased.Options.Governance.DRep
   ( pGovernanceDRepCmds
@@ -9,24 +7,21 @@ module Cardano.CLI.EraBased.Options.Governance.DRep
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley (Hash (DRepMetadataHash))
-
-import           Cardano.CLI.Commands.Hash (HashGoal (..))
-import           Cardano.CLI.Environment
-import           Cardano.CLI.EraBased.Commands.Governance.DRep
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Common hiding (CheckHash)
-import           Cardano.CLI.Types.Key
-
-import           Control.Applicative
-import           Data.Foldable
-import           Data.String
-import           Options.Applicative (Parser)
-import qualified Options.Applicative as Opt
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley (Hash (DRepMetadataHash))
+
+import Cardano.CLI.Commands.Hash (HashGoal (..))
+import Cardano.CLI.EraBased.Commands.Governance.DRep
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Common hiding (CheckHash)
+
+import Control.Applicative (Alternative ((<|>)), optional)
+import Data.Foldable (asum)
+import Options.Applicative (Parser)
+import Options.Applicative qualified as Opt
 
 pGovernanceDRepCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Poll.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Poll.hs
index 816b7e2763..18ff434f82 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Poll.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Poll.hs
@@ -3,17 +3,17 @@ module Cardano.CLI.EraBased.Options.Governance.Poll
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import qualified Cardano.CLI.EraBased.Commands.Governance.Poll as Cmd
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
-import           Cardano.Prelude (catMaybes, isInfixOf)
+import Cardano.CLI.EraBased.Commands.Governance.Poll qualified as Cmd
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
+import Cardano.Prelude (catMaybes, isInfixOf)
 
-import           Control.Monad (when)
-import           Data.Foldable
-import           Options.Applicative hiding (help, str)
-import qualified Options.Applicative as Opt
+import Control.Monad (when)
+import Data.Foldable
+import Options.Applicative hiding (help, str)
+import Options.Applicative qualified as Opt
 
 pGovernancePollCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs
index 994155928a..449345035b 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs
@@ -6,19 +6,21 @@ module Cardano.CLI.EraBased.Options.Governance.Vote
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.EraBased.Commands.Governance.Vote (GovernanceVoteCmds (..),
-                   GovernanceVoteCreateCmdArgs (GovernanceVoteCreateCmdArgs),
-                   GovernanceVoteViewCmdArgs (GovernanceVoteViewCmdArgs))
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
-import           Cardano.CLI.Types.Governance
+import Cardano.CLI.EraBased.Commands.Governance.Vote
+  ( GovernanceVoteCmds (..)
+  , GovernanceVoteCreateCmdArgs (GovernanceVoteCreateCmdArgs)
+  , GovernanceVoteViewCmdArgs (GovernanceVoteViewCmdArgs)
+  )
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
+import Cardano.CLI.Types.Governance
 
-import           Control.Applicative (optional)
-import           Data.Foldable
-import           Options.Applicative (Parser)
-import qualified Options.Applicative as Opt
+import Control.Applicative (optional)
+import Data.Foldable
+import Options.Applicative (Parser)
+import Options.Applicative qualified as Opt
 
 pGovernanceVoteCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs
index f235099a0f..d32b91af27 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs
@@ -9,21 +9,21 @@ module Cardano.CLI.EraBased.Options.Query
   )
 where
 
-import           Cardano.Api hiding (QueryInShelleyBasedEra (..))
-import qualified Cardano.Api as MemberStatus (MemberStatus (..))
-import           Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
-
-import           Cardano.CLI.Environment (EnvCli (..))
-import           Cardano.CLI.EraBased.Commands.Query
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Key
-
-import           Data.Foldable
-import           GHC.Exts (IsList (..))
-import           Options.Applicative hiding (help, str)
-import qualified Options.Applicative as Opt
+import Cardano.Api hiding (QueryInShelleyBasedEra (..))
+import Cardano.Api qualified as MemberStatus (MemberStatus (..))
+import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
+
+import Cardano.CLI.Environment (EnvCli (..))
+import Cardano.CLI.EraBased.Commands.Query
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Key
+
+import Data.Foldable
+import GHC.Exts (IsList (..))
+import Options.Applicative hiding (help, str)
+import Options.Applicative qualified as Opt
 
 {- HLINT ignore "Use <$>" -}
 {- HLINT ignore "Move brackets to avoid $" -}
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs
index 65871ffc25..4d57c1fdb6 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs
@@ -6,15 +6,15 @@ module Cardano.CLI.EraBased.Options.StakeAddress
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Environment
-import           Cardano.CLI.EraBased.Commands.StakeAddress
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
+import Cardano.CLI.Environment
+import Cardano.CLI.EraBased.Commands.StakeAddress
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
 
-import           Options.Applicative
-import qualified Options.Applicative as Opt
+import Options.Applicative
+import Options.Applicative qualified as Opt
 
 pStakeAddressCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs
index 476ed5fb4f..55b3e4fbdb 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs
@@ -11,19 +11,19 @@ module Cardano.CLI.EraBased.Options.StakePool
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley (Hash (StakePoolMetadataHash))
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley (Hash (StakePoolMetadataHash))
 
-import qualified Cardano.CLI.Commands.Hash as Cmd
-import           Cardano.CLI.Environment (EnvCli (..))
-import qualified Cardano.CLI.EraBased.Commands.StakePool as Cmd
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
+import Cardano.CLI.Commands.Hash qualified as Cmd
+import Cardano.CLI.Environment (EnvCli (..))
+import Cardano.CLI.EraBased.Commands.StakePool qualified as Cmd
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
 
-import qualified Data.Foldable as F
-import           Options.Applicative hiding (help, str)
-import qualified Options.Applicative as Opt
+import Data.Foldable qualified as F
+import Options.Applicative hiding (help, str)
+import Options.Applicative qualified as Opt
 
 pStakePoolCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/TextView.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/TextView.hs
index 2acbed4d0d..5f90341853 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/TextView.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/TextView.hs
@@ -8,12 +8,12 @@ module Cardano.CLI.EraBased.Options.TextView
   )
 where
 
-import           Cardano.CLI.EraBased.Commands.TextView
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
+import Cardano.CLI.EraBased.Commands.TextView
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
 
-import           Options.Applicative hiding (help, str)
-import qualified Options.Applicative as Opt
+import Options.Applicative hiding (help, str)
+import Options.Applicative qualified as Opt
 
 {- HLINT ignore "Use <$>" -}
 {- HLINT ignore "Move brackets to avoid $" -}
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/TopLevelCommands.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/TopLevelCommands.hs
index 94743923b7..ee1d35e983 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/TopLevelCommands.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/TopLevelCommands.hs
@@ -3,24 +3,24 @@ module Cardano.CLI.EraBased.Options.TopLevelCommands
   )
 where
 
-import           Cardano.Api (ShelleyBasedEra (..))
+import Cardano.Api (ShelleyBasedEra (..))
 
-import           Cardano.CLI.Environment
-import           Cardano.CLI.EraBased.Commands.TopLevelCommands
-import           Cardano.CLI.EraBased.Options.Genesis
-import           Cardano.CLI.EraBased.Options.Governance (pGovernanceCmds)
-import           Cardano.CLI.EraBased.Options.Query
-import           Cardano.CLI.EraBased.Options.StakeAddress
-import           Cardano.CLI.EraBased.Options.StakePool
-import           Cardano.CLI.EraBased.Options.TextView
-import           Cardano.CLI.EraBased.Options.Transaction
-import           Cardano.CLI.Options.Address
-import           Cardano.CLI.Options.Key
-import           Cardano.CLI.Options.Node
+import Cardano.CLI.Environment
+import Cardano.CLI.EraBased.Commands.TopLevelCommands
+import Cardano.CLI.EraBased.Options.Genesis
+import Cardano.CLI.EraBased.Options.Governance (pGovernanceCmds)
+import Cardano.CLI.EraBased.Options.Query
+import Cardano.CLI.EraBased.Options.StakeAddress
+import Cardano.CLI.EraBased.Options.StakePool
+import Cardano.CLI.EraBased.Options.TextView
+import Cardano.CLI.EraBased.Options.Transaction
+import Cardano.CLI.Options.Address
+import Cardano.CLI.Options.Key
+import Cardano.CLI.Options.Node
 
-import           Data.Foldable
-import           Data.Maybe
-import           Options.Applicative (Parser)
+import Data.Foldable
+import Data.Maybe
+import Options.Applicative (Parser)
 
 pCmds :: ShelleyBasedEra era -> EnvCli -> Parser (Cmds era)
 pCmds era envCli = do
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs
index f90fd7f9ed..6e36d47217 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs
@@ -9,20 +9,20 @@ module Cardano.CLI.EraBased.Options.Transaction
   )
 where
 
-import           Cardano.Api hiding (QueryInShelleyBasedEra (..))
-import qualified Cardano.Api.Experimental as Exp
+import Cardano.Api hiding (QueryInShelleyBasedEra (..))
+import Cardano.Api.Experimental qualified as Exp
 
-import           Cardano.CLI.Environment (EnvCli (..))
-import           Cardano.CLI.EraBased.Commands.Transaction
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Environment (EnvCli (..))
+import Cardano.CLI.EraBased.Commands.Transaction
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
+import Cardano.CLI.Types.Common
 
-import           Data.Foldable
-import           Options.Applicative hiding (help, str)
-import qualified Options.Applicative as Opt
-import qualified Options.Applicative.Help as H
-import           Prettyprinter (line)
+import Data.Foldable
+import Options.Applicative hiding (help, str)
+import Options.Applicative qualified as Opt
+import Options.Applicative.Help qualified as H
+import Prettyprinter (line)
 
 {- HLINT ignore "Use <$>" -}
 {- HLINT ignore "Move brackets to avoid $" -}
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run.hs
index 06fb9a978c..2d96171055 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run.hs
@@ -8,23 +8,23 @@ module Cardano.CLI.EraBased.Run
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.EraBased.Commands.TopLevelCommands
-import           Cardano.CLI.EraBased.Run.Genesis
-import           Cardano.CLI.EraBased.Run.Governance
-import           Cardano.CLI.EraBased.Run.Query
-import           Cardano.CLI.EraBased.Run.StakeAddress
-import           Cardano.CLI.EraBased.Run.StakePool
-import           Cardano.CLI.EraBased.Run.TextView
-import           Cardano.CLI.EraBased.Run.Transaction
-import           Cardano.CLI.Helpers (printEraDeprecationWarning)
-import           Cardano.CLI.Run.Address
-import           Cardano.CLI.Run.Key
-import           Cardano.CLI.Run.Node
-import           Cardano.CLI.Types.Errors.CmdError
+import Cardano.CLI.EraBased.Commands.TopLevelCommands
+import Cardano.CLI.EraBased.Run.Genesis
+import Cardano.CLI.EraBased.Run.Governance
+import Cardano.CLI.EraBased.Run.Query
+import Cardano.CLI.EraBased.Run.StakeAddress
+import Cardano.CLI.EraBased.Run.StakePool
+import Cardano.CLI.EraBased.Run.TextView
+import Cardano.CLI.EraBased.Run.Transaction
+import Cardano.CLI.Helpers (printEraDeprecationWarning)
+import Cardano.CLI.Run.Address
+import Cardano.CLI.Run.Key
+import Cardano.CLI.Run.Node
+import Cardano.CLI.Types.Errors.CmdError
 
-import           Data.Function ((&))
+import Data.Function ((&))
 
 runAnyEraCommand
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs
index 2b10401a4e..67eb0b1f5e 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs
@@ -27,73 +27,80 @@ module Cardano.CLI.EraBased.Run.Genesis
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Byron (toByronLovelace, toByronProtocolMagicId,
-                   toByronRequiresNetworkMagic)
-import qualified Cardano.Api.Byron as Byron hiding (GenesisParameters, SigningKey)
-import           Cardano.Api.Consensus (ShelleyGenesisStaking (..))
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
-
-import           Cardano.CLI.Byron.Delegation
-import           Cardano.CLI.Byron.Genesis as Byron
-import qualified Cardano.CLI.Byron.Key as Byron
-import qualified Cardano.CLI.Commands.Node as Cmd
-import           Cardano.CLI.EraBased.Commands.Genesis as Cmd
-import           Cardano.CLI.EraBased.Run.Genesis.Common
-import           Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData (WriteFileGenesis (..))
-import qualified Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData as TN
-import           Cardano.CLI.EraBased.Run.StakeAddress (runStakeAddressKeyGenCmd)
-import qualified Cardano.CLI.IO.Lazy as Lazy
-import           Cardano.CLI.Run.Node (runNodeIssueOpCertCmd, runNodeKeyGenColdCmd,
-                   runNodeKeyGenKesCmd, runNodeKeyGenVrfCmd)
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.GenesisCmdError
-import           Cardano.CLI.Types.Errors.NodeCmdError
-import           Cardano.CLI.Types.Errors.StakePoolCmdError
-import           Cardano.CLI.Types.Key
-import qualified Cardano.Crypto as CC
-import qualified Cardano.Crypto.Hash as Crypto
-import qualified Cardano.Crypto.Signing as Byron
-import           Cardano.Slotting.Slot (EpochSize (EpochSize))
-
-import           Control.DeepSeq (NFData, force)
-import           Control.Exception (evaluate)
-import           Control.Monad (forM, forM_, unless, when)
-import           Data.Aeson hiding (Key)
-import qualified Data.Aeson as Aeson
-import qualified Data.Aeson.KeyMap as Aeson
-import           Data.Bifunctor (Bifunctor (..))
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString.Char8 as BS
-import qualified Data.ByteString.Lazy.Char8 as LBS
-import           Data.Char (isDigit)
-import           Data.Fixed (Fixed (MkFixed))
-import           Data.Function (on)
-import           Data.Functor (void)
-import qualified Data.List as List
-import qualified Data.List.Split as List
-import           Data.ListMap (ListMap (..))
-import qualified Data.ListMap as ListMap
-import           Data.Map.Strict (Map)
-import qualified Data.Map.Strict as Map
-import           Data.Maybe (fromMaybe)
-import qualified Data.Sequence.Strict as Seq
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import qualified Data.Text.IO as Text
-import           Data.Word (Word64)
-import qualified Data.Yaml as Yaml
-import           GHC.Exts (IsList (..))
-import           GHC.Generics (Generic)
-import           Lens.Micro ((^.))
-import           System.Directory (createDirectoryIfMissing, listDirectory)
-import           System.FilePath (takeExtension, takeExtensions, (</>))
-import qualified System.IO as IO
-import           System.IO.Error (isDoesNotExistError)
-import qualified System.Random as Random
-import           System.Random (StdGen)
-import           Text.Read (readMaybe)
+import Cardano.Api
+import Cardano.Api.Byron
+  ( toByronLovelace
+  , toByronProtocolMagicId
+  , toByronRequiresNetworkMagic
+  )
+import Cardano.Api.Byron qualified as Byron hiding (GenesisParameters, SigningKey)
+import Cardano.Api.Consensus (ShelleyGenesisStaking (..))
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
+
+import Cardano.CLI.Byron.Delegation
+import Cardano.CLI.Byron.Genesis as Byron
+import Cardano.CLI.Byron.Key qualified as Byron
+import Cardano.CLI.Commands.Node qualified as Cmd
+import Cardano.CLI.EraBased.Commands.Genesis as Cmd
+import Cardano.CLI.EraBased.Run.Genesis.Common
+import Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData (WriteFileGenesis (..))
+import Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData qualified as TN
+import Cardano.CLI.EraBased.Run.StakeAddress (runStakeAddressKeyGenCmd)
+import Cardano.CLI.IO.Lazy qualified as Lazy
+import Cardano.CLI.Run.Node
+  ( runNodeIssueOpCertCmd
+  , runNodeKeyGenColdCmd
+  , runNodeKeyGenKesCmd
+  , runNodeKeyGenVrfCmd
+  )
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.GenesisCmdError
+import Cardano.CLI.Types.Errors.NodeCmdError
+import Cardano.CLI.Types.Errors.StakePoolCmdError
+import Cardano.CLI.Types.Key
+import Cardano.Crypto qualified as CC
+import Cardano.Crypto.Hash qualified as Crypto
+import Cardano.Crypto.Signing qualified as Byron
+import Cardano.Slotting.Slot (EpochSize (EpochSize))
+
+import Control.DeepSeq (NFData, force)
+import Control.Exception (evaluate)
+import Control.Monad (forM, forM_, unless, when)
+import Data.Aeson hiding (Key)
+import Data.Aeson qualified as Aeson
+import Data.Aeson.KeyMap qualified as Aeson
+import Data.Bifunctor (Bifunctor (..))
+import Data.ByteString (ByteString)
+import Data.ByteString.Char8 qualified as BS
+import Data.ByteString.Lazy.Char8 qualified as LBS
+import Data.Char (isDigit)
+import Data.Fixed (Fixed (MkFixed))
+import Data.Function (on)
+import Data.Functor (void)
+import Data.List qualified as List
+import Data.List.Split qualified as List
+import Data.ListMap (ListMap (..))
+import Data.ListMap qualified as ListMap
+import Data.Map.Strict (Map)
+import Data.Map.Strict qualified as Map
+import Data.Maybe (fromMaybe)
+import Data.Sequence.Strict qualified as Seq
+import Data.Text (Text)
+import Data.Text qualified as Text
+import Data.Text.IO qualified as Text
+import Data.Word (Word64)
+import Data.Yaml qualified as Yaml
+import GHC.Exts (IsList (..))
+import GHC.Generics (Generic)
+import Lens.Micro ((^.))
+import System.Directory (createDirectoryIfMissing, listDirectory)
+import System.FilePath (takeExtension, takeExtensions, (</>))
+import System.IO qualified as IO
+import System.IO.Error (isDoesNotExistError)
+import System.Random (StdGen)
+import System.Random qualified as Random
+import Text.Read (readMaybe)
 
 runGenesisCmds :: GenesisCmds era -> ExceptT GenesisCmdError IO ()
 runGenesisCmds = \case
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Byron.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Byron.hs
index 8e28658ab2..bf449ef813 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Byron.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Byron.hs
@@ -4,19 +4,19 @@
 
 module Cardano.CLI.EraBased.Run.Genesis.Byron where
 
-import           Cardano.Api.Byron (rationalToLovelacePortion)
-import qualified Cardano.Api.Byron as Byron hiding (GenesisParameters)
-import qualified Cardano.Api.Ledger as L
-import qualified Cardano.Api.Shelley as Shelley
+import Cardano.Api.Byron (rationalToLovelacePortion)
+import Cardano.Api.Byron qualified as Byron hiding (GenesisParameters)
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley qualified as Shelley
 
-import qualified Cardano.CLI.Byron.Genesis as Byron
-import qualified Cardano.Crypto.ProtocolMagic as Crypto
+import Cardano.CLI.Byron.Genesis qualified as Byron
+import Cardano.Crypto.ProtocolMagic qualified as Crypto
 
-import           Data.Aeson (toJSON, (.=))
-import qualified Data.Aeson as Aeson
-import           Data.Maybe (fromJust)
-import           Data.Ratio ((%))
-import           GHC.Word (Word32)
+import Data.Aeson (toJSON, (.=))
+import Data.Aeson qualified as Aeson
+import Data.Maybe (fromJust)
+import Data.Ratio ((%))
+import GHC.Word (Word32)
 
 -- | We need to pass these values to create the Byron genesis file.
 -- The values here don't matter as the testnet conditions are ultimately determined
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Common.hs
index 70af39090f..b57d47e9c7 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Common.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/Common.hs
@@ -21,30 +21,30 @@ module Cardano.CLI.EraBased.Run.Genesis.Common
   )
 where
 
-import           Cardano.Api hiding (ConwayEra)
-import           Cardano.Api.Ledger (AlonzoGenesis, ConwayGenesis, StandardCrypto)
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley (ShelleyGenesis, ShelleyLedgerEra, decodeAlonzoGenesis)
-
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.GenesisCmdError
-import           Cardano.CLI.Types.Errors.ProtocolParamsError
-import           Cardano.Crypto.Hash (HashAlgorithm)
-import qualified Cardano.Crypto.Hash as Hash
-import qualified Cardano.Crypto.Random as Crypto
-
-import qualified Data.Aeson as A
-import qualified Data.Binary.Get as Bin
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString.Lazy.Char8 as LBS
-import           Data.Coerce (coerce)
-import           Data.Data (Proxy (..))
-import           Data.Map.Strict (Map)
-import qualified Data.Text as Text
-import           Data.Time (NominalDiffTime, UTCTime, addUTCTime, getCurrentTime)
-import           Data.Word (Word64)
-
-import           Crypto.Random (getRandomBytes)
+import Cardano.Api hiding (ConwayEra)
+import Cardano.Api.Ledger (AlonzoGenesis, ConwayGenesis, StandardCrypto)
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley (ShelleyGenesis, ShelleyLedgerEra, decodeAlonzoGenesis)
+
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.GenesisCmdError
+import Cardano.CLI.Types.Errors.ProtocolParamsError
+import Cardano.Crypto.Hash (HashAlgorithm)
+import Cardano.Crypto.Hash qualified as Hash
+import Cardano.Crypto.Random qualified as Crypto
+
+import Data.Aeson qualified as A
+import Data.Binary.Get qualified as Bin
+import Data.ByteString (ByteString)
+import Data.ByteString.Lazy.Char8 qualified as LBS
+import Data.Coerce (coerce)
+import Data.Data (Proxy (..))
+import Data.Map.Strict (Map)
+import Data.Text qualified as Text
+import Data.Time (NominalDiffTime, UTCTime, addUTCTime, getCurrentTime)
+import Data.Word (Word64)
+
+import Crypto.Random (getRandomBytes)
 
 decodeShelleyGenesisFile
   :: MonadIOTransError GenesisCmdError t m
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs
index 675fed1cd8..82d1e7df85 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs
@@ -23,71 +23,93 @@ module Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData
   )
 where
 
-import           Cardano.Api hiding (ConwayEra)
-import           Cardano.Api.Consensus (ShelleyGenesisStaking (..))
-import           Cardano.Api.Ledger (StrictMaybe (SNothing))
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley (Hash (..), KESPeriod (KESPeriod),
-                   OperationalCertificateIssueCounter (OperationalCertificateIssueCounter),
-                   ShelleyGenesis (ShelleyGenesis, sgGenDelegs, sgInitialFunds, sgMaxLovelaceSupply, sgNetworkMagic, sgProtocolParams, sgStaking, sgSystemStart),
-                   StakeCredential (StakeCredentialByKey), VerificationKey (VrfVerificationKey),
-                   VrfKey, alonzoGenesisDefaults, conwayGenesisDefaults, shelleyGenesisDefaults,
-                   toShelleyAddr, toShelleyNetwork, toShelleyStakeAddr)
-
-import           Cardano.CLI.Byron.Genesis (NewDirectory (NewDirectory))
-import qualified Cardano.CLI.Byron.Genesis as Byron
-import qualified Cardano.CLI.Commands.Node as Cmd
-import           Cardano.CLI.EraBased.Commands.Genesis as Cmd
-import qualified Cardano.CLI.EraBased.Commands.Governance.Committee as CC
-import qualified Cardano.CLI.EraBased.Commands.Governance.DRep as DRep
-import           Cardano.CLI.EraBased.Run.Genesis.Byron as Byron
-import           Cardano.CLI.EraBased.Run.Genesis.Common
-import qualified Cardano.CLI.EraBased.Run.Governance.Committee as CC
-import qualified Cardano.CLI.EraBased.Run.Governance.DRep as DRep
-import           Cardano.CLI.EraBased.Run.StakeAddress (runStakeAddressKeyGenCmd)
-import qualified Cardano.CLI.IO.Lazy as Lazy
-import           Cardano.CLI.Run.Address (generateAndWriteKeyFiles)
-import qualified Cardano.CLI.Run.Key as Key
-import           Cardano.CLI.Run.Node (runNodeIssueOpCertCmd, runNodeKeyGenColdCmd,
-                   runNodeKeyGenKesCmd, runNodeKeyGenVrfCmd)
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.GenesisCmdError
-import           Cardano.CLI.Types.Errors.NodeCmdError
-import           Cardano.CLI.Types.Errors.StakePoolCmdError
-import           Cardano.CLI.Types.Key
-import qualified Cardano.Crypto.Hash as Crypto
-import           Cardano.Prelude (canonicalEncodePretty)
-
-import           Control.DeepSeq (NFData, deepseq)
-import           Control.Monad (forM, forM_, unless, void, when)
-import qualified Data.Aeson.Encode.Pretty as Aeson
-import           Data.Bifunctor (Bifunctor (..))
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString.Char8 as BS
-import qualified Data.ByteString.Lazy.Char8 as LBS
-import           Data.Function ((&))
-import           Data.Functor.Identity (Identity)
-import           Data.ListMap (ListMap (..))
-import           Data.Map.Strict (Map)
-import qualified Data.Map.Strict as Map
-import           Data.Maybe (fromMaybe)
-import qualified Data.Sequence.Strict as Seq
-import qualified Data.Set as Set
-import           Data.String (fromString)
-import qualified Data.Text as Text
-import           Data.Tuple (swap)
-import           Data.Word (Word64)
-import           GHC.Exts (IsList (..))
-import           GHC.Generics (Generic)
-import           GHC.Num (Natural)
-import           Lens.Micro ((^.))
-import           System.Directory
-import           System.FilePath ((</>))
-import qualified System.Random as Random
-import           System.Random (StdGen)
-import qualified Text.JSON.Canonical (ToJSON)
-import           Text.JSON.Canonical (parseCanonicalJSON, renderCanonicalJSON)
-import           Text.Printf (printf)
+import Cardano.Api hiding (ConwayEra)
+import Cardano.Api.Consensus (ShelleyGenesisStaking (..))
+import Cardano.Api.Ledger (StrictMaybe (SNothing))
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
+  ( Hash (..)
+  , KESPeriod (KESPeriod)
+  , OperationalCertificateIssueCounter (OperationalCertificateIssueCounter)
+  , ShelleyGenesis
+    ( ShelleyGenesis
+    , sgGenDelegs
+    , sgInitialFunds
+    , sgMaxLovelaceSupply
+    , sgNetworkMagic
+    , sgProtocolParams
+    , sgStaking
+    , sgSystemStart
+    )
+  , StakeCredential (StakeCredentialByKey)
+  , VerificationKey (VrfVerificationKey)
+  , VrfKey
+  , alonzoGenesisDefaults
+  , conwayGenesisDefaults
+  , shelleyGenesisDefaults
+  , toShelleyAddr
+  , toShelleyNetwork
+  , toShelleyStakeAddr
+  )
+
+import Cardano.CLI.Byron.Genesis (NewDirectory (NewDirectory))
+import Cardano.CLI.Byron.Genesis qualified as Byron
+import Cardano.CLI.Commands.Node qualified as Cmd
+import Cardano.CLI.EraBased.Commands.Genesis as Cmd
+import Cardano.CLI.EraBased.Commands.Governance.Committee qualified as CC
+import Cardano.CLI.EraBased.Commands.Governance.DRep qualified as DRep
+import Cardano.CLI.EraBased.Run.Genesis.Byron as Byron
+import Cardano.CLI.EraBased.Run.Genesis.Common
+import Cardano.CLI.EraBased.Run.Governance.Committee qualified as CC
+import Cardano.CLI.EraBased.Run.Governance.DRep qualified as DRep
+import Cardano.CLI.EraBased.Run.StakeAddress (runStakeAddressKeyGenCmd)
+import Cardano.CLI.IO.Lazy qualified as Lazy
+import Cardano.CLI.Run.Address (generateAndWriteKeyFiles)
+import Cardano.CLI.Run.Key qualified as Key
+import Cardano.CLI.Run.Node
+  ( runNodeIssueOpCertCmd
+  , runNodeKeyGenColdCmd
+  , runNodeKeyGenKesCmd
+  , runNodeKeyGenVrfCmd
+  )
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.GenesisCmdError
+import Cardano.CLI.Types.Errors.NodeCmdError
+import Cardano.CLI.Types.Errors.StakePoolCmdError
+import Cardano.CLI.Types.Key
+import Cardano.Crypto.Hash qualified as Crypto
+import Cardano.Prelude (canonicalEncodePretty)
+
+import Control.DeepSeq (NFData, deepseq)
+import Control.Monad (forM, forM_, unless, void, when)
+import Data.Aeson.Encode.Pretty qualified as Aeson
+import Data.Bifunctor (Bifunctor (..))
+import Data.ByteString (ByteString)
+import Data.ByteString.Char8 qualified as BS
+import Data.ByteString.Lazy.Char8 qualified as LBS
+import Data.Function ((&))
+import Data.Functor.Identity (Identity)
+import Data.ListMap (ListMap (..))
+import Data.Map.Strict (Map)
+import Data.Map.Strict qualified as Map
+import Data.Maybe (fromMaybe)
+import Data.Sequence.Strict qualified as Seq
+import Data.Set qualified as Set
+import Data.String (fromString)
+import Data.Text qualified as Text
+import Data.Tuple (swap)
+import Data.Word (Word64)
+import GHC.Exts (IsList (..))
+import GHC.Generics (Generic)
+import GHC.Num (Natural)
+import Lens.Micro ((^.))
+import System.Directory
+import System.FilePath ((</>))
+import System.Random (StdGen)
+import System.Random qualified as Random
+import Text.JSON.Canonical (parseCanonicalJSON, renderCanonicalJSON)
+import Text.JSON.Canonical qualified (ToJSON)
+import Text.Printf (printf)
 
 runGenesisKeyGenGenesisCmd
   :: GenesisKeyGenGenesisCmdArgs
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs
index e8b803bffd..68e578d963 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs
@@ -15,23 +15,23 @@ module Cardano.CLI.EraBased.Run.Governance
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
 
-import qualified Cardano.CLI.EraBased.Commands.Governance as Cmd
-import           Cardano.CLI.EraBased.Run.Governance.Actions
-import           Cardano.CLI.EraBased.Run.Governance.Committee
-import           Cardano.CLI.EraBased.Run.Governance.DRep
-import           Cardano.CLI.EraBased.Run.Governance.GenesisKeyDelegationCertificate
-import           Cardano.CLI.EraBased.Run.Governance.Poll
-import           Cardano.CLI.EraBased.Run.Governance.Vote
-import           Cardano.CLI.Types.Errors.CmdError
-import           Cardano.CLI.Types.Errors.GovernanceCmdError
+import Cardano.CLI.EraBased.Commands.Governance qualified as Cmd
+import Cardano.CLI.EraBased.Run.Governance.Actions
+import Cardano.CLI.EraBased.Run.Governance.Committee
+import Cardano.CLI.EraBased.Run.Governance.DRep
+import Cardano.CLI.EraBased.Run.Governance.GenesisKeyDelegationCertificate
+import Cardano.CLI.EraBased.Run.Governance.Poll
+import Cardano.CLI.EraBased.Run.Governance.Vote
+import Cardano.CLI.Types.Errors.CmdError
+import Cardano.CLI.Types.Errors.GovernanceCmdError
 
-import           Control.Monad
-import           Data.Function
-import           GHC.Exts (IsList (..))
+import Control.Monad
+import Data.Function
+import GHC.Exts (IsList (..))
 
 runGovernanceCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs
index f414df01ed..ece7008d20 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs
@@ -13,23 +13,23 @@ module Cardano.CLI.EraBased.Run.Governance.Actions
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Ledger (StrictMaybe (..))
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
-
-import           Cardano.CLI.EraBased.Commands.Governance.Actions
-import qualified Cardano.CLI.EraBased.Commands.Governance.Actions as Cmd
-import           Cardano.CLI.Json.Friendly
-import           Cardano.CLI.Read
-import           Cardano.CLI.Run.Hash (getByteStringFromURL, httpsAndIpfsSchemes)
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.GovernanceActionsError
-import           Cardano.CLI.Types.Errors.HashCmdError (FetchURLError)
-import           Cardano.CLI.Types.Key
-
-import           Control.Monad
-import           GHC.Exts (IsList (..))
+import Cardano.Api
+import Cardano.Api.Ledger (StrictMaybe (..))
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
+
+import Cardano.CLI.EraBased.Commands.Governance.Actions
+import Cardano.CLI.EraBased.Commands.Governance.Actions qualified as Cmd
+import Cardano.CLI.Json.Friendly
+import Cardano.CLI.Read
+import Cardano.CLI.Run.Hash (getByteStringFromURL, httpsAndIpfsSchemes)
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.GovernanceActionsError
+import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError)
+import Cardano.CLI.Types.Key
+
+import Control.Monad
+import GHC.Exts (IsList (..))
 
 runGovernanceActionCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Committee.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Committee.hs
index 7dee0445e9..834b39c06b 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Committee.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Committee.hs
@@ -11,22 +11,22 @@ module Cardano.CLI.EraBased.Run.Governance.Committee
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
-
-import           Cardano.CLI.EraBased.Commands.Governance.Committee
-import qualified Cardano.CLI.EraBased.Commands.Governance.Committee as Cmd
-import           Cardano.CLI.Read (readVerificationKeySource)
-import           Cardano.CLI.Run.Hash (carryHashChecks)
-import qualified Cardano.CLI.Run.Key as Key
-import           Cardano.CLI.Types.Common (PotentiallyCheckedAnchor (..))
-import           Cardano.CLI.Types.Errors.GovernanceCommitteeError
-import           Cardano.CLI.Types.Key.VerificationKey
-
-import           Control.Monad (void)
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString.Char8 as BS
-import           Data.Function
+import Cardano.Api
+import Cardano.Api.Shelley
+
+import Cardano.CLI.EraBased.Commands.Governance.Committee
+import Cardano.CLI.EraBased.Commands.Governance.Committee qualified as Cmd
+import Cardano.CLI.Read (readVerificationKeySource)
+import Cardano.CLI.Run.Hash (carryHashChecks)
+import Cardano.CLI.Run.Key qualified as Key
+import Cardano.CLI.Types.Common (PotentiallyCheckedAnchor (..))
+import Cardano.CLI.Types.Errors.GovernanceCommitteeError
+import Cardano.CLI.Types.Key.VerificationKey
+
+import Control.Monad (void)
+import Data.ByteString (ByteString)
+import Data.ByteString.Char8 qualified as BS
+import Data.Function
 
 runGovernanceCommitteeCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs
index c9e495c8d6..0b7f167a8e 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs
@@ -6,7 +6,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeApplications #-}
 
 {- HLINT ignore "Use let" -}
 
@@ -16,24 +15,24 @@ module Cardano.CLI.EraBased.Run.Governance.DRep
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-
-import qualified Cardano.CLI.Commands.Hash as Cmd
-import qualified Cardano.CLI.EraBased.Commands.Governance.DRep as Cmd
-import           Cardano.CLI.Run.Hash (allSchemes, carryHashChecks, getByteStringFromURL)
-import qualified Cardano.CLI.Run.Key as Key
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.CmdError
-import           Cardano.CLI.Types.Errors.GovernanceCmdError
-import           Cardano.CLI.Types.Errors.HashCmdError (FetchURLError)
-import           Cardano.CLI.Types.Errors.RegistrationError
-import           Cardano.CLI.Types.Key
-
-import           Control.Monad (void)
-import           Data.ByteString (ByteString)
-import           Data.Function
-import qualified Data.Text.Encoding as Text
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+
+import Cardano.CLI.Commands.Hash qualified as Cmd
+import Cardano.CLI.EraBased.Commands.Governance.DRep qualified as Cmd
+import Cardano.CLI.Run.Hash (allSchemes, carryHashChecks, getByteStringFromURL)
+import Cardano.CLI.Run.Key qualified as Key
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.CmdError
+import Cardano.CLI.Types.Errors.GovernanceCmdError
+import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError)
+import Cardano.CLI.Types.Errors.RegistrationError
+import Cardano.CLI.Types.Key
+
+import Control.Monad (void)
+import Data.ByteString (ByteString)
+import Data.Function
+import Data.Text.Encoding qualified as Text
 
 runGovernanceDRepCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/GenesisKeyDelegationCertificate.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/GenesisKeyDelegationCertificate.hs
index 27af1be856..ddc007650a 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/GenesisKeyDelegationCertificate.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/GenesisKeyDelegationCertificate.hs
@@ -8,11 +8,11 @@ module Cardano.CLI.EraBased.Run.Governance.GenesisKeyDelegationCertificate
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Errors.GovernanceCmdError
-import           Cardano.CLI.Types.Key
+import Cardano.CLI.Types.Errors.GovernanceCmdError
+import Cardano.CLI.Types.Key
 
 runGovernanceGenesisKeyDelegationCertificate
   :: forall era
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Poll.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Poll.hs
index 412cb89fef..9dc093f558 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Poll.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Poll.hs
@@ -12,23 +12,23 @@ module Cardano.CLI.EraBased.Run.Governance.Poll
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
-
-import qualified Cardano.CLI.EraBased.Commands.Governance.Poll as Cmd
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Errors.GovernanceCmdError
-
-import           Control.Monad
-import qualified Data.ByteString.Char8 as BSC
-import           Data.Function ((&))
-import           Data.String (fromString)
-import qualified Data.Text as Text
-import qualified Data.Text.Encoding as Text
-import qualified Data.Text.IO as Text
-import qualified Data.Text.Read as Text
-import qualified System.IO as IO
-import           System.IO (stderr, stdin, stdout)
+import Cardano.Api
+import Cardano.Api.Shelley
+
+import Cardano.CLI.EraBased.Commands.Governance.Poll qualified as Cmd
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Errors.GovernanceCmdError
+
+import Control.Monad
+import Data.ByteString.Char8 qualified as BSC
+import Data.Function ((&))
+import Data.String (fromString)
+import Data.Text qualified as Text
+import Data.Text.Encoding qualified as Text
+import Data.Text.IO qualified as Text
+import Data.Text.Read qualified as Text
+import System.IO (stderr, stdin, stdout)
+import System.IO qualified as IO
 
 runGovernancePollCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs
index 2b4e6b7007..9b0c451314 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs
@@ -11,22 +11,22 @@ module Cardano.CLI.EraBased.Run.Governance.Vote
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
 
-import qualified Cardano.CLI.EraBased.Commands.Governance.Vote as Cmd
-import           Cardano.CLI.EraBased.Script.Vote.Read
-import           Cardano.CLI.Run.Hash (carryHashChecks)
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.CmdError
-import           Cardano.CLI.Types.Errors.GovernanceVoteCmdError
-import           Cardano.CLI.Types.Governance
-import           Cardano.CLI.Types.Key
+import Cardano.CLI.EraBased.Commands.Governance.Vote qualified as Cmd
+import Cardano.CLI.EraBased.Script.Vote.Read
+import Cardano.CLI.Run.Hash (carryHashChecks)
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.CmdError
+import Cardano.CLI.Types.Errors.GovernanceVoteCmdError
+import Cardano.CLI.Types.Governance
+import Cardano.CLI.Types.Key
 
-import           Data.Aeson.Encode.Pretty
-import           Data.Function
-import qualified Data.Yaml.Pretty as Yaml
+import Data.Aeson.Encode.Pretty
+import Data.Function
+import Data.Yaml.Pretty qualified as Yaml
 
 runGovernanceVoteCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs
index 01190ba690..52e966a71d 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs
@@ -38,62 +38,62 @@ module Cardano.CLI.EraBased.Run.Query
   )
 where
 
-import           Cardano.Api hiding (QueryInShelleyBasedEra (..))
-import qualified Cardano.Api as Api
-import qualified Cardano.Api.Consensus as Consensus
-import           Cardano.Api.Ledger (StandardCrypto, strictMaybeToMaybe)
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Network (LedgerPeerSnapshot, Serialised (..))
-import qualified Cardano.Api.Network as Consensus
-import           Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
-
-import qualified Cardano.Binary as CBOR
-import qualified Cardano.CLI.EraBased.Commands.Query as Cmd
-import           Cardano.CLI.EraBased.Run.Genesis.Common
-import           Cardano.CLI.Helpers
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.NodeEraMismatchError
-import           Cardano.CLI.Types.Errors.QueryCmdError
-import           Cardano.CLI.Types.Key
-import           Cardano.CLI.Types.Output (QueryDRepStateOutput (..))
-import qualified Cardano.CLI.Types.Output as O
-import           Cardano.Crypto.Hash (hashToBytesAsHex)
-import qualified Cardano.Crypto.Hash.Blake2b as Blake2b
-import           Cardano.Slotting.EpochInfo (EpochInfo (..), epochInfoSlotToUTCTime, hoistEpochInfo)
-import           Cardano.Slotting.Time (RelativeTime (..), toRelativeTime)
-
-import           Control.Monad (forM, forM_, join)
-import           Data.Aeson as Aeson
-import qualified Data.Aeson as A
-import           Data.Aeson.Encode.Pretty (encodePretty)
-import           Data.Bifunctor (Bifunctor (..))
-import qualified Data.ByteString.Lazy as BS
-import qualified Data.ByteString.Lazy.Char8 as LBS
-import           Data.Coerce (coerce)
-import           Data.Function ((&))
-import           Data.Functor ((<&>))
-import qualified Data.List as List
-import           Data.Map.Strict (Map)
-import qualified Data.Map.Strict as Map
-import           Data.Proxy (Proxy (..))
-import qualified Data.Sequence as Seq
-import           Data.Set (Set)
-import qualified Data.Set as Set
-import           Data.String
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import qualified Data.Text.Encoding as Text
-import qualified Data.Text.IO as T
-import qualified Data.Text.Lazy.IO as LT
-import           Data.Time.Clock
-import           GHC.Exts (IsList (..))
-import           GHC.Generics
-import           Lens.Micro ((^.))
-import           Numeric (showEFloat)
-import           Prettyprinter
-import           Prettyprinter.Render.Terminal (AnsiStyle)
-import qualified System.IO as IO
-import           Text.Printf (printf)
+import Cardano.Api hiding (QueryInShelleyBasedEra (..))
+import Cardano.Api qualified as Api
+import Cardano.Api.Consensus qualified as Consensus
+import Cardano.Api.Ledger (StandardCrypto, strictMaybeToMaybe)
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Network (LedgerPeerSnapshot, Serialised (..))
+import Cardano.Api.Network qualified as Consensus
+import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
+
+import Cardano.Binary qualified as CBOR
+import Cardano.CLI.EraBased.Commands.Query qualified as Cmd
+import Cardano.CLI.EraBased.Run.Genesis.Common
+import Cardano.CLI.Helpers
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.NodeEraMismatchError
+import Cardano.CLI.Types.Errors.QueryCmdError
+import Cardano.CLI.Types.Key
+import Cardano.CLI.Types.Output (QueryDRepStateOutput (..))
+import Cardano.CLI.Types.Output qualified as O
+import Cardano.Crypto.Hash (hashToBytesAsHex)
+import Cardano.Crypto.Hash.Blake2b qualified as Blake2b
+import Cardano.Slotting.EpochInfo (EpochInfo (..), epochInfoSlotToUTCTime, hoistEpochInfo)
+import Cardano.Slotting.Time (RelativeTime (..), toRelativeTime)
+
+import Control.Monad (forM, forM_, join)
+import Data.Aeson as Aeson
+import Data.Aeson qualified as A
+import Data.Aeson.Encode.Pretty (encodePretty)
+import Data.Bifunctor (Bifunctor (..))
+import Data.ByteString.Lazy qualified as BS
+import Data.ByteString.Lazy.Char8 qualified as LBS
+import Data.Coerce (coerce)
+import Data.Function ((&))
+import Data.Functor ((<&>))
+import Data.List qualified as List
+import Data.Map.Strict (Map)
+import Data.Map.Strict qualified as Map
+import Data.Proxy (Proxy (..))
+import Data.Sequence qualified as Seq
+import Data.Set (Set)
+import Data.Set qualified as Set
+import Data.String
+import Data.Text (Text)
+import Data.Text qualified as Text
+import Data.Text.Encoding qualified as Text
+import Data.Text.IO qualified as T
+import Data.Text.Lazy.IO qualified as LT
+import Data.Time.Clock
+import GHC.Exts (IsList (..))
+import GHC.Generics
+import Lens.Micro ((^.))
+import Numeric (showEFloat)
+import Prettyprinter
+import Prettyprinter.Render.Terminal (AnsiStyle)
+import System.IO qualified as IO
+import Text.Printf (printf)
 
 runQueryCmds :: Cmd.QueryCmds era -> ExceptT QueryCmdError IO ()
 runQueryCmds = \case
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/StakeAddress.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/StakeAddress.hs
index 7534533050..9702737fd9 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/StakeAddress.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/StakeAddress.hs
@@ -20,23 +20,23 @@ module Cardano.CLI.EraBased.Run.StakeAddress
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
-
-import           Cardano.CLI.EraBased.Commands.StakeAddress
-import           Cardano.CLI.Read
-import qualified Cardano.CLI.Run.Key as Key
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.StakeAddressCmdError
-import           Cardano.CLI.Types.Errors.StakeAddressRegistrationError
-import           Cardano.CLI.Types.Governance
-import           Cardano.CLI.Types.Key
-
-import           Control.Monad (void)
-import qualified Data.ByteString.Char8 as BS
-import           Data.Function ((&))
-import qualified Data.Text.IO as Text
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
+
+import Cardano.CLI.EraBased.Commands.StakeAddress
+import Cardano.CLI.Read
+import Cardano.CLI.Run.Key qualified as Key
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.StakeAddressCmdError
+import Cardano.CLI.Types.Errors.StakeAddressRegistrationError
+import Cardano.CLI.Types.Governance
+import Cardano.CLI.Types.Key
+
+import Control.Monad (void)
+import Data.ByteString.Char8 qualified as BS
+import Data.Function ((&))
+import Data.Text.IO qualified as Text
 
 runStakeAddressCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/StakePool.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/StakePool.hs
index 6895aa812c..e74c2e581c 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/StakePool.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/StakePool.hs
@@ -14,20 +14,20 @@ module Cardano.CLI.EraBased.Run.StakePool
   )
 where
 
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
 
-import qualified Cardano.CLI.Commands.Hash as Cmd
-import           Cardano.CLI.EraBased.Commands.StakePool
-import qualified Cardano.CLI.EraBased.Commands.StakePool as Cmd
-import           Cardano.CLI.Run.Hash (allSchemes, getByteStringFromURL, httpsAndIpfsSchemes)
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.HashCmdError (FetchURLError (..))
-import           Cardano.CLI.Types.Errors.StakePoolCmdError
-import           Cardano.CLI.Types.Key (readVerificationKeyOrFile)
+import Cardano.CLI.Commands.Hash qualified as Cmd
+import Cardano.CLI.EraBased.Commands.StakePool
+import Cardano.CLI.EraBased.Commands.StakePool qualified as Cmd
+import Cardano.CLI.Run.Hash (allSchemes, getByteStringFromURL, httpsAndIpfsSchemes)
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError (..))
+import Cardano.CLI.Types.Errors.StakePoolCmdError
+import Cardano.CLI.Types.Key (readVerificationKeyOrFile)
 
-import           Control.Monad (when)
-import qualified Data.ByteString.Char8 as BS
+import Control.Monad (when)
+import Data.ByteString.Char8 qualified as BS
 
 runStakePoolCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/TextView.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/TextView.hs
index 98a458b6e4..d7899526ee 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/TextView.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/TextView.hs
@@ -7,13 +7,13 @@ module Cardano.CLI.EraBased.Run.TextView
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.EraBased.Commands.TextView
-import           Cardano.CLI.Helpers (pPrintCBOR)
-import           Cardano.CLI.Types.Errors.TextViewFileError
+import Cardano.CLI.EraBased.Commands.TextView
+import Cardano.CLI.Helpers (pPrintCBOR)
+import Cardano.CLI.Types.Errors.TextViewFileError
 
-import qualified Data.ByteString.Lazy.Char8 as LBS
+import Data.ByteString.Lazy.Char8 qualified as LBS
 
 runTextViewCmds :: TextViewCmds era -> ExceptT TextViewFileError IO ()
 runTextViewCmds = \case
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs
index 959c91a8c9..d04fd4848e 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs
@@ -37,70 +37,73 @@ module Cardano.CLI.EraBased.Run.Transaction
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api as Api
-import qualified Cardano.Api.Byron as Byron
-import           Cardano.Api.Consensus (EraMismatch (..))
-import qualified Cardano.Api.Ledger as L
-import qualified Cardano.Api.Network as Consensus
-import qualified Cardano.Api.Network as Net.Tx
-import           Cardano.Api.Shelley
-
-import qualified Cardano.Binary as CBOR
-import           Cardano.CLI.EraBased.Commands.Transaction
-import qualified Cardano.CLI.EraBased.Commands.Transaction as Cmd
-import           Cardano.CLI.EraBased.Run.Genesis.Common (readProtocolParameters)
-import           Cardano.CLI.EraBased.Run.Query
-import           Cardano.CLI.EraBased.Script.Certificate.Read
-import           Cardano.CLI.EraBased.Script.Certificate.Types (CertificateScriptWitness (..))
-import           Cardano.CLI.EraBased.Script.Mint.Read
-import           Cardano.CLI.EraBased.Script.Mint.Types
-import           Cardano.CLI.EraBased.Script.Proposal.Types (ProposalScriptWitness (..))
-import           Cardano.CLI.EraBased.Script.Read.Common
-import           Cardano.CLI.EraBased.Script.Spend.Read
-import           Cardano.CLI.EraBased.Script.Spend.Types (SpendScriptWitness (..))
-import           Cardano.CLI.EraBased.Script.Vote.Types
-import           Cardano.CLI.EraBased.Script.Withdrawal.Read
-import           Cardano.CLI.EraBased.Script.Withdrawal.Types (WithdrawalScriptWitness (..))
-import           Cardano.CLI.EraBased.Transaction.HashCheck (checkCertificateHashes,
-                   checkProposalHashes, checkVotingProcedureHashes)
-import           Cardano.CLI.Orphans ()
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.BootstrapWitnessError
-import           Cardano.CLI.Types.Errors.NodeEraMismatchError
-import           Cardano.CLI.Types.Errors.TxCmdError
-import           Cardano.CLI.Types.Errors.TxValidationError
-import           Cardano.CLI.Types.Output (renderScriptCostsWithScriptHashesMap)
-import           Cardano.CLI.Types.TxFeature
-import           Cardano.Ledger.Api (allInputsTxBodyF, bodyTxL)
-import           Cardano.Prelude (putLByteString)
-
-import           Control.Monad (forM, unless)
-import           Data.Aeson ((.=))
-import qualified Data.Aeson as Aeson
-import           Data.Aeson.Encode.Pretty (encodePretty)
-import           Data.Bifunctor (Bifunctor (..))
-import qualified Data.ByteString as Data.Bytestring
-import qualified Data.ByteString.Char8 as BS
-import qualified Data.ByteString.Lazy.Char8 as LBS
-import           Data.Containers.ListUtils (nubOrd)
-import           Data.Data ((:~:) (..))
-import           Data.Foldable (forM_)
-import qualified Data.Foldable as Foldable
-import           Data.Function ((&))
-import qualified Data.List as List
-import           Data.Map.Strict (Map)
-import qualified Data.Map.Strict as Map
-import           Data.Maybe
-import           Data.Set (Set)
-import qualified Data.Set as Set
-import qualified Data.Text as Text
-import qualified Data.Text.IO as Text
-import           Data.Type.Equality (TestEquality (..))
-import           GHC.Exts (IsList (..))
-import           Lens.Micro ((^.))
-import qualified System.IO as IO
+import Cardano.Api
+import Cardano.Api qualified as Api
+import Cardano.Api.Byron qualified as Byron
+import Cardano.Api.Consensus (EraMismatch (..))
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Network qualified as Consensus
+import Cardano.Api.Network qualified as Net.Tx
+import Cardano.Api.Shelley
+
+import Cardano.Binary qualified as CBOR
+import Cardano.CLI.EraBased.Commands.Transaction
+import Cardano.CLI.EraBased.Commands.Transaction qualified as Cmd
+import Cardano.CLI.EraBased.Run.Genesis.Common (readProtocolParameters)
+import Cardano.CLI.EraBased.Run.Query
+import Cardano.CLI.EraBased.Script.Certificate.Read
+import Cardano.CLI.EraBased.Script.Certificate.Types (CertificateScriptWitness (..))
+import Cardano.CLI.EraBased.Script.Mint.Read
+import Cardano.CLI.EraBased.Script.Mint.Types
+import Cardano.CLI.EraBased.Script.Proposal.Types (ProposalScriptWitness (..))
+import Cardano.CLI.EraBased.Script.Read.Common
+import Cardano.CLI.EraBased.Script.Spend.Read
+import Cardano.CLI.EraBased.Script.Spend.Types (SpendScriptWitness (..))
+import Cardano.CLI.EraBased.Script.Vote.Types
+import Cardano.CLI.EraBased.Script.Withdrawal.Read
+import Cardano.CLI.EraBased.Script.Withdrawal.Types (WithdrawalScriptWitness (..))
+import Cardano.CLI.EraBased.Transaction.HashCheck
+  ( checkCertificateHashes
+  , checkProposalHashes
+  , checkVotingProcedureHashes
+  )
+import Cardano.CLI.Orphans ()
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.BootstrapWitnessError
+import Cardano.CLI.Types.Errors.NodeEraMismatchError
+import Cardano.CLI.Types.Errors.TxCmdError
+import Cardano.CLI.Types.Errors.TxValidationError
+import Cardano.CLI.Types.Output (renderScriptCostsWithScriptHashesMap)
+import Cardano.CLI.Types.TxFeature
+import Cardano.Ledger.Api (allInputsTxBodyF, bodyTxL)
+import Cardano.Prelude (putLByteString)
+
+import Control.Monad (forM, unless)
+import Data.Aeson ((.=))
+import Data.Aeson qualified as Aeson
+import Data.Aeson.Encode.Pretty (encodePretty)
+import Data.Bifunctor (Bifunctor (..))
+import Data.ByteString qualified as Data.Bytestring
+import Data.ByteString.Char8 qualified as BS
+import Data.ByteString.Lazy.Char8 qualified as LBS
+import Data.Containers.ListUtils (nubOrd)
+import Data.Data ((:~:) (..))
+import Data.Foldable (forM_)
+import Data.Foldable qualified as Foldable
+import Data.Function ((&))
+import Data.List qualified as List
+import Data.Map.Strict (Map)
+import Data.Map.Strict qualified as Map
+import Data.Maybe
+import Data.Set (Set)
+import Data.Set qualified as Set
+import Data.Text qualified as Text
+import Data.Text.IO qualified as Text
+import Data.Type.Equality (TestEquality (..))
+import GHC.Exts (IsList (..))
+import Lens.Micro ((^.))
+import System.IO qualified as IO
 
 runTransactionCmds :: Cmd.TransactionCmds era -> ExceptT TxCmdError IO ()
 runTransactionCmds = \case
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs
index c314a2550c..fd868fce20 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs
@@ -9,15 +9,15 @@ module Cardano.CLI.EraBased.Script.Certificate.Read
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.EraBased.Script.Certificate.Types
-import           Cardano.CLI.EraBased.Script.Read.Common
-import           Cardano.CLI.EraBased.Script.Types
-import           Cardano.CLI.Types.Common (CertificateFile)
+import Cardano.CLI.EraBased.Script.Certificate.Types
+import Cardano.CLI.EraBased.Script.Read.Common
+import Cardano.CLI.EraBased.Script.Types
+import Cardano.CLI.Types.Common (CertificateFile)
 
-import           Control.Monad
+import Control.Monad
 
 readCertificateScriptWitnesses
   :: MonadIOTransError (FileError CliScriptWitnessError) t m
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Types.hs
index 44a6fdb782..531df1b595 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Types.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Types.hs
@@ -12,9 +12,9 @@ module Cardano.CLI.EraBased.Script.Certificate.Types
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Types.Common (ScriptDataOrFile)
+import Cardano.CLI.Types.Common (ScriptDataOrFile)
 
 newtype CertificateScriptWitness era
   = CertificateScriptWitness {cswScriptWitness :: ScriptWitness WitCtxStake era}
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Read.hs
index 0bd00f6e15..e6c8302eeb 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Read.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Read.hs
@@ -7,12 +7,12 @@ module Cardano.CLI.EraBased.Script.Mint.Read
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.EraBased.Script.Mint.Types
-import           Cardano.CLI.EraBased.Script.Read.Common
-import           Cardano.CLI.EraBased.Script.Types
+import Cardano.CLI.EraBased.Script.Mint.Types
+import Cardano.CLI.EraBased.Script.Read.Common
+import Cardano.CLI.EraBased.Script.Types
 
 readMintScriptWitness
   :: MonadIOTransError (FileError CliScriptWitnessError) t m
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Types.hs
index a081d0cab9..6a2ec8d2f8 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Types.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Types.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
-{-# LANGUAGE LambdaCase #-}
 
 module Cardano.CLI.EraBased.Script.Mint.Types
   ( CliMintScriptRequirements (..)
@@ -15,9 +14,9 @@ module Cardano.CLI.EraBased.Script.Mint.Types
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Types.Common (ScriptDataOrFile)
+import Cardano.CLI.Types.Common (ScriptDataOrFile)
 
 -- We always need the policy id when constructing a transaction that mints.
 -- In the case of reference scripts, the user currently must provide the policy id (script hash)
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Read.hs
index bdd1ee9309..c1b53fada4 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Read.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Read.hs
@@ -7,13 +7,13 @@ module Cardano.CLI.EraBased.Script.Proposal.Read
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.EraBased.Script.Proposal.Types
-import           Cardano.CLI.EraBased.Script.Read.Common
-import           Cardano.CLI.EraBased.Script.Types
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.EraBased.Script.Proposal.Types
+import Cardano.CLI.EraBased.Script.Read.Common
+import Cardano.CLI.EraBased.Script.Types
+import Cardano.CLI.Types.Common
 
 readProposalScriptWitness
   :: MonadIOTransError (FileError CliScriptWitnessError) t m
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Types.hs
index 93009b1e7c..81d57c1289 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Types.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Types.hs
@@ -12,9 +12,9 @@ module Cardano.CLI.EraBased.Script.Proposal.Types
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Types.Common (ScriptDataOrFile)
+import Cardano.CLI.Types.Common (ScriptDataOrFile)
 
 newtype ProposalScriptWitness era
   = ProposalScriptWitness {pswScriptWitness :: ScriptWitness WitCtxStake era}
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Read/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Read/Common.hs
index 07440ee3bb..52c4b49909 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Read/Common.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Read/Common.hs
@@ -13,21 +13,21 @@ module Cardano.CLI.EraBased.Script.Read.Common
   )
 where
 
-import           Cardano.Api as Api
+import Cardano.Api as Api
 
-import           Cardano.CLI.EraBased.Script.Types
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.PlutusScriptDecodeError
-import           Cardano.CLI.Types.Errors.ScriptDataError
-import           Cardano.CLI.Types.Errors.ScriptDecodeError
+import Cardano.CLI.EraBased.Script.Types
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.PlutusScriptDecodeError
+import Cardano.CLI.Types.Errors.ScriptDataError
+import Cardano.CLI.Types.Errors.ScriptDecodeError
 
-import           Prelude
+import Prelude
 
-import qualified Data.Aeson as Aeson
-import           Data.Bifunctor
-import qualified Data.ByteString as BS
-import qualified Data.ByteString.Lazy.Char8 as LBS
-import qualified Data.Text as Text
+import Data.Aeson qualified as Aeson
+import Data.Bifunctor
+import Data.ByteString qualified as BS
+import Data.ByteString.Lazy.Char8 qualified as LBS
+import Data.Text qualified as Text
 
 deserialisePlutusScript
   :: BS.ByteString
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Read.hs
index 40756e5cd3..f0d103f9a4 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Read.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Read.hs
@@ -11,15 +11,15 @@ module Cardano.CLI.EraBased.Script.Spend.Read
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.EraBased.Script.Read.Common
-import           Cardano.CLI.EraBased.Script.Spend.Types
-import           Cardano.CLI.EraBased.Script.Types
-import           Cardano.CLI.Read
+import Cardano.CLI.EraBased.Script.Read.Common
+import Cardano.CLI.EraBased.Script.Spend.Types
+import Cardano.CLI.EraBased.Script.Types
+import Cardano.CLI.Read
 
-import           Control.Monad
+import Control.Monad
 
 data CliSpendScriptWitnessError
   = CliScriptWitnessError CliScriptWitnessError
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Types.hs
index 3f715c5de9..c7102c18b3 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Types.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Spend/Types.hs
@@ -15,9 +15,9 @@ module Cardano.CLI.EraBased.Script.Spend.Types
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Types.Common (ScriptDataOrFile)
+import Cardano.CLI.Types.Common (ScriptDataOrFile)
 
 newtype SpendScriptWitness era
   = SpendScriptWitness {sswScriptWitness :: ScriptWitness WitCtxTxIn era}
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Types.hs
index 979dd9381a..abfad35e1d 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Types.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Types.hs
@@ -9,11 +9,11 @@ module Cardano.CLI.EraBased.Script.Types
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Types.Errors.PlutusScriptDecodeError
-import           Cardano.CLI.Types.Errors.ScriptDataError
-import           Cardano.CLI.Types.Errors.ScriptDecodeError
+import Cardano.CLI.Types.Errors.PlutusScriptDecodeError
+import Cardano.CLI.Types.Errors.ScriptDataError
+import Cardano.CLI.Types.Errors.ScriptDecodeError
 
 -- TODO: Move to cardano-api
 data AnyPlutusScript where
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Read.hs
index 7e0aada924..a493be0482 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Read.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Read.hs
@@ -7,13 +7,13 @@ module Cardano.CLI.EraBased.Script.Vote.Read
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.EraBased.Script.Read.Common
-import           Cardano.CLI.EraBased.Script.Types
-import           Cardano.CLI.EraBased.Script.Vote.Types
-import           Cardano.CLI.Types.Governance
+import Cardano.CLI.EraBased.Script.Read.Common
+import Cardano.CLI.EraBased.Script.Types
+import Cardano.CLI.EraBased.Script.Vote.Types
+import Cardano.CLI.Types.Governance
 
 readVoteScriptWitness
   :: MonadIOTransError (FileError CliScriptWitnessError) t m
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Types.hs
index 100e08c0c9..3cd41187ea 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Types.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Vote/Types.hs
@@ -12,9 +12,9 @@ module Cardano.CLI.EraBased.Script.Vote.Types
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Types.Common (ScriptDataOrFile)
+import Cardano.CLI.Types.Common (ScriptDataOrFile)
 
 newtype VoteScriptWitness era
   = VoteScriptWitness {vswScriptWitness :: ScriptWitness WitCtxStake era}
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Read.hs
index 3537e3e10b..0f25d48eb3 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Read.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Read.hs
@@ -7,13 +7,13 @@ module Cardano.CLI.EraBased.Script.Withdrawal.Read
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Ledger
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Ledger
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.EraBased.Script.Read.Common
-import           Cardano.CLI.EraBased.Script.Types
-import           Cardano.CLI.EraBased.Script.Withdrawal.Types
+import Cardano.CLI.EraBased.Script.Read.Common
+import Cardano.CLI.EraBased.Script.Types
+import Cardano.CLI.EraBased.Script.Withdrawal.Types
 
 readWithdrawalScriptWitness
   :: MonadIOTransError (FileError CliScriptWitnessError) t m
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Types.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Types.hs
index 0309e5ce4e..2c851975cd 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Types.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Withdrawal/Types.hs
@@ -12,9 +12,9 @@ module Cardano.CLI.EraBased.Script.Withdrawal.Types
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Types.Common (ScriptDataOrFile)
+import Cardano.CLI.Types.Common (ScriptDataOrFile)
 
 newtype WithdrawalScriptWitness era
   = WithdrawalScriptWitness {wswScriptWitness :: ScriptWitness WitCtxStake era}
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Transaction/HashCheck.hs b/cardano-cli/src/Cardano/CLI/EraBased/Transaction/HashCheck.hs
index aabc37fbe9..5ce9508ea5 100644
--- a/cardano-cli/src/Cardano/CLI/EraBased/Transaction/HashCheck.hs
+++ b/cardano-cli/src/Cardano/CLI/EraBased/Transaction/HashCheck.hs
@@ -7,16 +7,23 @@ module Cardano.CLI.EraBased.Transaction.HashCheck
   )
 where
 
-import           Cardano.Api (Certificate (..), ExceptT, except, firstExceptT,
-                   getAnchorDataFromCertificate, getAnchorDataFromGovernanceAction, withExceptT)
-import qualified Cardano.Api.Ledger as L
-import qualified Cardano.Api.Shelley as Shelley
+import Cardano.Api
+  ( Certificate (..)
+  , ExceptT
+  , except
+  , firstExceptT
+  , getAnchorDataFromCertificate
+  , getAnchorDataFromGovernanceAction
+  , withExceptT
+  )
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley qualified as Shelley
 
-import           Cardano.CLI.Run.Hash (carryHashChecks)
-import           Cardano.CLI.Types.Common (MustCheckHash (..), PotentiallyCheckedAnchor (..))
-import           Cardano.CLI.Types.Errors.TxCmdError (TxCmdError (..))
+import Cardano.CLI.Run.Hash (carryHashChecks)
+import Cardano.CLI.Types.Common (MustCheckHash (..), PotentiallyCheckedAnchor (..))
+import Cardano.CLI.Types.Errors.TxCmdError (TxCmdError (..))
 
-import           Control.Monad (forM_)
+import Control.Monad (forM_)
 
 -- | Check the hash of the anchor data against the hash in the anchor
 checkAnchorMetadataHash :: L.Anchor L.StandardCrypto -> ExceptT TxCmdError IO ()
diff --git a/cardano-cli/src/Cardano/CLI/Helpers.hs b/cardano-cli/src/Cardano/CLI/Helpers.hs
index a0a3de0cba..28e3f947f7 100644
--- a/cardano-cli/src/Cardano/CLI/Helpers.hs
+++ b/cardano-cli/src/Cardano/CLI/Helpers.hs
@@ -18,30 +18,30 @@ module Cardano.CLI.Helpers
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Byron as Byron
-import qualified Cardano.Api.Ledger as L
+import Cardano.Api
+import Cardano.Api.Byron qualified as Byron
+import Cardano.Api.Ledger qualified as L
 
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Common
 
-import           Codec.CBOR.Pretty (prettyHexEnc)
-import           Codec.CBOR.Read (DeserialiseFailure, deserialiseFromBytes)
-import           Codec.CBOR.Term (decodeTerm, encodeTerm)
-import           Control.Exception (Exception (..), IOException)
-import           Control.Monad (unless, when)
-import           Data.Bifunctor (Bifunctor (..))
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString as BS
-import qualified Data.ByteString.Lazy as LB
-import           Data.Functor (void)
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import qualified Data.Text.IO as Text
-import           Data.Typeable (Typeable)
-import qualified System.Console.ANSI as ANSI
-import           System.Console.ANSI
-import qualified System.Directory as IO
-import qualified System.IO as IO
+import Codec.CBOR.Pretty (prettyHexEnc)
+import Codec.CBOR.Read (DeserialiseFailure, deserialiseFromBytes)
+import Codec.CBOR.Term (decodeTerm, encodeTerm)
+import Control.Exception (Exception (..), IOException)
+import Control.Monad (unless, when)
+import Data.Bifunctor (Bifunctor (..))
+import Data.ByteString (ByteString)
+import Data.ByteString qualified as BS
+import Data.ByteString.Lazy qualified as LB
+import Data.Functor (void)
+import Data.Text (Text)
+import Data.Text qualified as Text
+import Data.Text.IO qualified as Text
+import Data.Typeable (Typeable)
+import System.Console.ANSI
+import System.Console.ANSI qualified as ANSI
+import System.Directory qualified as IO
+import System.IO qualified as IO
 
 data HelpersError
   = CBORPrettyPrintError !DeserialiseFailure
diff --git a/cardano-cli/src/Cardano/CLI/IO/Lazy.hs b/cardano-cli/src/Cardano/CLI/IO/Lazy.hs
index 20f24bbf51..e784681821 100644
--- a/cardano-cli/src/Cardano/CLI/IO/Lazy.hs
+++ b/cardano-cli/src/Cardano/CLI/IO/Lazy.hs
@@ -11,10 +11,14 @@ module Cardano.CLI.IO.Lazy
   )
 where
 
-import           Control.Monad.IO.Unlift (MonadIO (liftIO), MonadUnliftIO, UnliftIO (unliftIO),
-                   askUnliftIO)
-import qualified Data.List as L
-import qualified System.IO.Unsafe as IO
+import Control.Monad.IO.Unlift
+  ( MonadIO (liftIO)
+  , MonadUnliftIO
+  , UnliftIO (unliftIO)
+  , askUnliftIO
+  )
+import Data.List qualified as L
+import System.IO.Unsafe qualified as IO
 
 replicateM :: MonadUnliftIO m => Int -> m a -> m [a]
 replicateM n f = sequenceM (L.replicate n f)
diff --git a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs
index 777565bef0..ff1698b610 100644
--- a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs
+++ b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs
@@ -40,48 +40,55 @@ module Cardano.CLI.Json.Friendly
   )
 where
 
-import           Cardano.Api as Api
-import           Cardano.Api.Byron (KeyWitness (ByronKeyWitness))
-import           Cardano.Api.Ledger (ExUnits (..), extractHash, strictMaybeToMaybe)
-import qualified Cardano.Api.Ledger as Alonzo
-import qualified Cardano.Api.Ledger as L
-import qualified Cardano.Api.Ledger as Ledger
-import           Cardano.Api.Shelley (Hash (..),
-                   KeyWitness (ShelleyBootstrapWitness, ShelleyKeyWitness), Proposal (..),
-                   ShelleyLedgerEra, StakeAddress (..), Tx (ShelleyTx),
-                   fromShelleyPaymentCredential, fromShelleyStakeReference, getTxBodyAndWitnesses,
-                   toShelleyStakeCredential)
-
-import           Cardano.CLI.Orphans ()
-import           Cardano.CLI.Types.Common (ViewOutputFormat (..))
-import           Cardano.CLI.Types.MonadWarning (MonadWarning, runWarningIO)
-import           Cardano.Crypto.Hash (hashToTextAsHex)
-
-import           Data.Aeson (Value (..), object, toJSON, (.=))
-import qualified Data.Aeson as Aeson
-import qualified Data.Aeson.Encode.Pretty as Aeson
-import qualified Data.Aeson.Key as Aeson
-import qualified Data.Aeson.KeyMap as KeyMap
-import qualified Data.Aeson.Types as Aeson
-import qualified Data.ByteString as BS
-import qualified Data.ByteString.Char8 as BSC
-import qualified Data.ByteString.Lazy as LBS
-import           Data.Char (isAscii)
-import           Data.Function ((&))
-import           Data.Functor ((<&>))
-import qualified Data.Map.Strict as Map
-import           Data.Maybe
-import           Data.Ratio (numerator)
-import qualified Data.Text as T
-import qualified Data.Text as Text
-import qualified Data.Vector as Vector
-import           Data.Yaml (array)
-import           Data.Yaml.Pretty (setConfCompare)
-import qualified Data.Yaml.Pretty as Yaml
-import           GHC.Exts (IsList (..))
-import           GHC.Real (denominator)
-import           GHC.Unicode (isAlphaNum)
-import           Lens.Micro ((^.))
+import Cardano.Api as Api
+import Cardano.Api.Byron (KeyWitness (ByronKeyWitness))
+import Cardano.Api.Ledger (ExUnits (..), extractHash, strictMaybeToMaybe)
+import Cardano.Api.Ledger qualified as Alonzo
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Ledger qualified as Ledger
+import Cardano.Api.Shelley
+  ( Hash (..)
+  , KeyWitness (ShelleyBootstrapWitness, ShelleyKeyWitness)
+  , Proposal (..)
+  , ShelleyLedgerEra
+  , StakeAddress (..)
+  , Tx (ShelleyTx)
+  , fromShelleyPaymentCredential
+  , fromShelleyStakeReference
+  , getTxBodyAndWitnesses
+  , toShelleyStakeCredential
+  )
+
+import Cardano.CLI.Orphans ()
+import Cardano.CLI.Types.Common (ViewOutputFormat (..))
+import Cardano.CLI.Types.MonadWarning (MonadWarning, runWarningIO)
+import Cardano.Crypto.Hash (hashToTextAsHex)
+
+import Data.Aeson (Value (..), object, toJSON, (.=))
+import Data.Aeson qualified as Aeson
+import Data.Aeson.Encode.Pretty qualified as Aeson
+import Data.Aeson.Key qualified as Aeson
+import Data.Aeson.KeyMap qualified as KeyMap
+import Data.Aeson.Types qualified as Aeson
+import Data.ByteString qualified as BS
+import Data.ByteString.Char8 qualified as BSC
+import Data.ByteString.Lazy qualified as LBS
+import Data.Char (isAscii)
+import Data.Function ((&))
+import Data.Functor ((<&>))
+import Data.Map.Strict qualified as Map
+import Data.Maybe
+import Data.Ratio (numerator)
+import Data.Text qualified as T
+import Data.Text qualified as Text
+import Data.Vector qualified as Vector
+import Data.Yaml (array)
+import Data.Yaml.Pretty (setConfCompare)
+import Data.Yaml.Pretty qualified as Yaml
+import GHC.Exts (IsList (..))
+import GHC.Real (denominator)
+import GHC.Unicode (isAlphaNum)
+import Lens.Micro ((^.))
 
 data FriendlyFormat = FriendlyJson | FriendlyYaml
 
diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands.hs b/cardano-cli/src/Cardano/CLI/Legacy/Commands.hs
index f536c95dba..8ab27feb04 100644
--- a/cardano-cli/src/Cardano/CLI/Legacy/Commands.hs
+++ b/cardano-cli/src/Cardano/CLI/Legacy/Commands.hs
@@ -6,10 +6,10 @@ module Cardano.CLI.Legacy.Commands
   )
 where
 
-import           Cardano.CLI.Legacy.Commands.Genesis
-import           Cardano.CLI.Legacy.Commands.Governance
+import Cardano.CLI.Legacy.Commands.Genesis
+import Cardano.CLI.Legacy.Commands.Governance
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data LegacyCmds
   = LegacyGenesisCmds LegacyGenesisCmds
diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Genesis.hs b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Genesis.hs
index ce34840f43..3b763a8fb6 100644
--- a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Genesis.hs
+++ b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Genesis.hs
@@ -7,13 +7,13 @@ module Cardano.CLI.Legacy.Commands.Genesis
   )
 where
 
-import qualified Cardano.Api.Byron as Byron
-import           Cardano.Api.Ledger (Coin)
-import           Cardano.Api.Shelley
+import Cardano.Api.Byron qualified as Byron
+import Cardano.Api.Ledger (Coin)
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Common
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data LegacyGenesisCmds
   = GenesisCreate
diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Governance.hs b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Governance.hs
index 2ba3634873..c9f148d232 100644
--- a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Governance.hs
+++ b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Governance.hs
@@ -4,14 +4,14 @@
 
 module Cardano.CLI.Legacy.Commands.Governance where
 
-import           Cardano.Api
-import           Cardano.Api.Ledger (Coin)
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Ledger (Coin)
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Key
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Key
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data LegacyGovernanceCmds
   = GovernanceCreateMirCertificateStakeAddressesCmd
diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs
index 4a80354609..64efb24d30 100644
--- a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs
+++ b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs
@@ -18,23 +18,23 @@ module Cardano.CLI.Legacy.Options
   )
 where
 
-import           Cardano.Api hiding (QueryInShelleyBasedEra (..))
-import qualified Cardano.Api.Byron as Byron
-import           Cardano.Api.Ledger (Coin (..))
-
-import           Cardano.CLI.Environment
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Legacy.Commands
-import           Cardano.CLI.Legacy.Commands.Genesis
-import           Cardano.CLI.Legacy.Commands.Governance
-import           Cardano.CLI.Parser
-import           Cardano.CLI.Types.Common
-
-import           Data.Foldable
-import           Data.Maybe (fromMaybe)
-import           Data.Word (Word64)
-import           Options.Applicative hiding (help, str)
-import qualified Options.Applicative as Opt
+import Cardano.Api hiding (QueryInShelleyBasedEra (..))
+import Cardano.Api.Byron qualified as Byron
+import Cardano.Api.Ledger (Coin (..))
+
+import Cardano.CLI.Environment
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Legacy.Commands
+import Cardano.CLI.Legacy.Commands.Genesis
+import Cardano.CLI.Legacy.Commands.Governance
+import Cardano.CLI.Parser
+import Cardano.CLI.Types.Common
+
+import Data.Foldable
+import Data.Maybe (fromMaybe)
+import Data.Word (Word64)
+import Options.Applicative hiding (help, str)
+import Options.Applicative qualified as Opt
 
 {- HLINT ignore "Use <$>" -}
 {- HLINT ignore "Move brackets to avoid $" -}
diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run.hs b/cardano-cli/src/Cardano/CLI/Legacy/Run.hs
index 857b55f8c4..41744c8250 100644
--- a/cardano-cli/src/Cardano/CLI/Legacy/Run.hs
+++ b/cardano-cli/src/Cardano/CLI/Legacy/Run.hs
@@ -5,13 +5,13 @@ module Cardano.CLI.Legacy.Run
   )
 where
 
-import           Cardano.CLI.Legacy.Options
-import           Cardano.CLI.Legacy.Run.Genesis
-import           Cardano.CLI.Legacy.Run.Governance
-import           Cardano.CLI.Types.Errors.CmdError
+import Cardano.CLI.Legacy.Options
+import Cardano.CLI.Legacy.Run.Genesis
+import Cardano.CLI.Legacy.Run.Governance
+import Cardano.CLI.Types.Errors.CmdError
 
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT)
+import Control.Monad.Trans.Except (ExceptT)
+import Control.Monad.Trans.Except.Extra (firstExceptT)
 
 runLegacyCmds :: LegacyCmds -> ExceptT CmdError IO ()
 runLegacyCmds = \case
diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/Legacy/Run/Genesis.hs
index fa1dac1c68..aba7b8c4d6 100644
--- a/cardano-cli/src/Cardano/CLI/Legacy/Run/Genesis.hs
+++ b/cardano-cli/src/Cardano/CLI/Legacy/Run/Genesis.hs
@@ -9,18 +9,19 @@ module Cardano.CLI.Legacy.Run.Genesis
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Byron as Byron
-import           Cardano.Api.Ledger (Coin (..))
+import Cardano.Api
+import Cardano.Api.Byron qualified as Byron
+import Cardano.Api.Ledger (Coin (..))
 
-import           Cardano.CLI.EraBased.Commands.Genesis
-                   (GenesisKeyGenGenesisCmdArgs (GenesisKeyGenGenesisCmdArgs))
-import qualified Cardano.CLI.EraBased.Commands.Genesis as Cmd
-import           Cardano.CLI.EraBased.Run.Genesis
-import qualified Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData as CreateTestnetData
-import           Cardano.CLI.Legacy.Commands.Genesis
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.GenesisCmdError
+import Cardano.CLI.EraBased.Commands.Genesis
+  ( GenesisKeyGenGenesisCmdArgs (GenesisKeyGenGenesisCmdArgs)
+  )
+import Cardano.CLI.EraBased.Commands.Genesis qualified as Cmd
+import Cardano.CLI.EraBased.Run.Genesis
+import Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData qualified as CreateTestnetData
+import Cardano.CLI.Legacy.Commands.Genesis
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.GenesisCmdError
 
 runLegacyGenesisCmds :: LegacyGenesisCmds -> ExceptT GenesisCmdError IO ()
 runLegacyGenesisCmds = \case
diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run/Governance.hs b/cardano-cli/src/Cardano/CLI/Legacy/Run/Governance.hs
index cf6c5f5a13..e9f3ccf8a9 100644
--- a/cardano-cli/src/Cardano/CLI/Legacy/Run/Governance.hs
+++ b/cardano-cli/src/Cardano/CLI/Legacy/Run/Governance.hs
@@ -10,25 +10,26 @@ module Cardano.CLI.Legacy.Run.Governance
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
-
-import qualified Cardano.CLI.EraBased.Commands.Governance.Poll as Cmd
-import           Cardano.CLI.EraBased.Run.Governance
-import           Cardano.CLI.EraBased.Run.Governance.GenesisKeyDelegationCertificate
-                   (runGovernanceGenesisKeyDelegationCertificate)
-import           Cardano.CLI.EraBased.Run.Governance.Poll
-import           Cardano.CLI.Legacy.Commands.Governance
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.GovernanceCmdError
-
-import           Control.Monad
-import           Data.Aeson (eitherDecode)
-import qualified Data.ByteString.Lazy as LB
-import           Data.Function ((&))
-import           Data.Text (Text)
-import qualified Data.Text as Text
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
+
+import Cardano.CLI.EraBased.Commands.Governance.Poll qualified as Cmd
+import Cardano.CLI.EraBased.Run.Governance
+import Cardano.CLI.EraBased.Run.Governance.GenesisKeyDelegationCertificate
+  ( runGovernanceGenesisKeyDelegationCertificate
+  )
+import Cardano.CLI.EraBased.Run.Governance.Poll
+import Cardano.CLI.Legacy.Commands.Governance
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.GovernanceCmdError
+
+import Control.Monad
+import Data.Aeson (eitherDecode)
+import Data.ByteString.Lazy qualified as LB
+import Data.Function ((&))
+import Data.Text (Text)
+import Data.Text qualified as Text
 
 runLegacyGovernanceCmds :: LegacyGovernanceCmds -> ExceptT GovernanceCmdError IO ()
 runLegacyGovernanceCmds = \case
diff --git a/cardano-cli/src/Cardano/CLI/Options.hs b/cardano-cli/src/Cardano/CLI/Options.hs
index 700e1e8b40..0601fc800d 100644
--- a/cardano-cli/src/Cardano/CLI/Options.hs
+++ b/cardano-cli/src/Cardano/CLI/Options.hs
@@ -9,27 +9,27 @@ module Cardano.CLI.Options
   )
 where
 
-import           Cardano.CLI.Byron.Parsers (backwardsCompatibilityCommands, parseByronCommands)
-import           Cardano.CLI.Compatible.Commands
-import           Cardano.CLI.Environment (EnvCli)
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.EraBased.Options.Era
-import           Cardano.CLI.EraBased.Options.Query (pQueryCmdsTopLevel)
-import           Cardano.CLI.Legacy.Options (parseLegacyCmds)
-import           Cardano.CLI.Options.Address
-import           Cardano.CLI.Options.Debug
-import           Cardano.CLI.Options.Hash
-import           Cardano.CLI.Options.Key
-import           Cardano.CLI.Options.Node
-import           Cardano.CLI.Options.Ping (parsePingCmd)
-import           Cardano.CLI.Parser
-import           Cardano.CLI.Render (customRenderHelp)
-import           Cardano.CLI.Run (ClientCommand (..))
-
-import           Data.Foldable
-import           Options.Applicative
-import qualified Options.Applicative as Opt
-import qualified Prettyprinter as PP
+import Cardano.CLI.Byron.Parsers (backwardsCompatibilityCommands, parseByronCommands)
+import Cardano.CLI.Compatible.Commands
+import Cardano.CLI.Environment (EnvCli)
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.EraBased.Options.Era
+import Cardano.CLI.EraBased.Options.Query (pQueryCmdsTopLevel)
+import Cardano.CLI.Legacy.Options (parseLegacyCmds)
+import Cardano.CLI.Options.Address
+import Cardano.CLI.Options.Debug
+import Cardano.CLI.Options.Hash
+import Cardano.CLI.Options.Key
+import Cardano.CLI.Options.Node
+import Cardano.CLI.Options.Ping (parsePingCmd)
+import Cardano.CLI.Parser
+import Cardano.CLI.Render (customRenderHelp)
+import Cardano.CLI.Run (ClientCommand (..))
+
+import Data.Foldable
+import Options.Applicative
+import Options.Applicative qualified as Opt
+import Prettyprinter qualified as PP
 
 opts :: EnvCli -> ParserInfo ClientCommand
 opts envCli =
diff --git a/cardano-cli/src/Cardano/CLI/Options/Address.hs b/cardano-cli/src/Cardano/CLI/Options/Address.hs
index 46e4be5c4a..7fbcc0fb9b 100644
--- a/cardano-cli/src/Cardano/CLI/Options/Address.hs
+++ b/cardano-cli/src/Cardano/CLI/Options/Address.hs
@@ -8,14 +8,14 @@ module Cardano.CLI.Options.Address
   )
 where
 
-import           Cardano.CLI.Commands.Address
-import           Cardano.CLI.Environment (EnvCli (..))
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
+import Cardano.CLI.Commands.Address
+import Cardano.CLI.Environment (EnvCli (..))
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
 
-import           Data.Foldable
-import           Options.Applicative hiding (help, str)
-import qualified Options.Applicative as Opt
+import Data.Foldable
+import Options.Applicative hiding (help, str)
+import Options.Applicative qualified as Opt
 
 pAddressCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/Options/Debug.hs b/cardano-cli/src/Cardano/CLI/Options/Debug.hs
index 6b05b2b7fb..a0d982e8e9 100644
--- a/cardano-cli/src/Cardano/CLI/Options/Debug.hs
+++ b/cardano-cli/src/Cardano/CLI/Options/Debug.hs
@@ -11,19 +11,19 @@ module Cardano.CLI.Options.Debug
   )
 where
 
-import           Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
+import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
 
-import           Cardano.CLI.Commands.Debug
-import           Cardano.CLI.Commands.Debug.CheckNodeConfiguration
-import           Cardano.CLI.Commands.Debug.LogEpochState
-import           Cardano.CLI.Commands.Debug.TransactionView
-import           Cardano.CLI.Environment
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
+import Cardano.CLI.Commands.Debug
+import Cardano.CLI.Commands.Debug.CheckNodeConfiguration
+import Cardano.CLI.Commands.Debug.LogEpochState
+import Cardano.CLI.Commands.Debug.TransactionView
+import Cardano.CLI.Environment
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
 
-import           Data.Foldable
-import           Options.Applicative hiding (help, str)
-import qualified Options.Applicative as Opt
+import Data.Foldable
+import Options.Applicative hiding (help, str)
+import Options.Applicative qualified as Opt
 
 parseDebugCmds :: EnvCli -> Parser DebugCmds
 parseDebugCmds envCli =
diff --git a/cardano-cli/src/Cardano/CLI/Options/Hash.hs b/cardano-cli/src/Cardano/CLI/Options/Hash.hs
index 46507f9040..fbca5582b5 100644
--- a/cardano-cli/src/Cardano/CLI/Options/Hash.hs
+++ b/cardano-cli/src/Cardano/CLI/Options/Hash.hs
@@ -6,15 +6,15 @@ module Cardano.CLI.Options.Hash
   )
 where
 
-import qualified Cardano.Api.Ledger as L
+import Cardano.Api.Ledger qualified as L
 
-import qualified Cardano.CLI.Commands.Hash as Cmd
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
+import Cardano.CLI.Commands.Hash qualified as Cmd
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
 
-import           Data.Foldable
-import           Options.Applicative
-import qualified Options.Applicative as Opt
+import Data.Foldable
+import Options.Applicative
+import Options.Applicative qualified as Opt
 
 pHashCmds :: Parser Cmd.HashCmds
 pHashCmds =
diff --git a/cardano-cli/src/Cardano/CLI/Options/Key.hs b/cardano-cli/src/Cardano/CLI/Options/Key.hs
index 33d2a0477c..e61a9d5411 100644
--- a/cardano-cli/src/Cardano/CLI/Options/Key.hs
+++ b/cardano-cli/src/Cardano/CLI/Options/Key.hs
@@ -8,17 +8,17 @@ module Cardano.CLI.Options.Key
   )
 where
 
-import           Cardano.Api hiding (QueryInShelleyBasedEra (..))
+import Cardano.Api hiding (QueryInShelleyBasedEra (..))
 
-import           Cardano.CLI.Commands.Key
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Commands.Key
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
+import Cardano.CLI.Types.Common
 
-import           Data.Foldable
-import           Data.Text (Text)
-import           Options.Applicative hiding (help, str)
-import qualified Options.Applicative as Opt
+import Data.Foldable
+import Data.Text (Text)
+import Options.Applicative hiding (help, str)
+import Options.Applicative qualified as Opt
 
 {- HLINT ignore "Use <$>" -}
 {- HLINT ignore "Move brackets to avoid $" -}
diff --git a/cardano-cli/src/Cardano/CLI/Options/Node.hs b/cardano-cli/src/Cardano/CLI/Options/Node.hs
index 759302cda2..11ac5e1d03 100644
--- a/cardano-cli/src/Cardano/CLI/Options/Node.hs
+++ b/cardano-cli/src/Cardano/CLI/Options/Node.hs
@@ -8,16 +8,16 @@ module Cardano.CLI.Options.Node
   )
 where
 
-import           Cardano.Api hiding (QueryInShelleyBasedEra (..))
+import Cardano.Api hiding (QueryInShelleyBasedEra (..))
 
-import           Cardano.CLI.Commands.Node
-import qualified Cardano.CLI.Commands.Node as Cmd
-import           Cardano.CLI.EraBased.Options.Common
-import           Cardano.CLI.Parser
+import Cardano.CLI.Commands.Node
+import Cardano.CLI.Commands.Node qualified as Cmd
+import Cardano.CLI.EraBased.Options.Common
+import Cardano.CLI.Parser
 
-import           Data.Foldable
-import           Options.Applicative hiding (help, str)
-import qualified Options.Applicative as Opt
+import Data.Foldable
+import Options.Applicative hiding (help, str)
+import Options.Applicative qualified as Opt
 
 {- HLINT ignore "Use <$>" -}
 {- HLINT ignore "Move brackets to avoid $" -}
diff --git a/cardano-cli/src/Cardano/CLI/Options/Ping.hs b/cardano-cli/src/Cardano/CLI/Options/Ping.hs
index 97cbc37cf7..46f8789333 100644
--- a/cardano-cli/src/Cardano/CLI/Options/Ping.hs
+++ b/cardano-cli/src/Cardano/CLI/Options/Ping.hs
@@ -7,14 +7,14 @@ module Cardano.CLI.Options.Ping
   )
 where
 
-import           Cardano.CLI.Commands (ClientCommand (CliPingCommand))
-import           Cardano.CLI.Commands.Ping
-import           Cardano.CLI.EraBased.Options.Common (integralReader)
-import qualified Cardano.Network.Ping as CNP
+import Cardano.CLI.Commands (ClientCommand (CliPingCommand))
+import Cardano.CLI.Commands.Ping
+import Cardano.CLI.EraBased.Options.Common (integralReader)
+import Cardano.Network.Ping qualified as CNP
 
-import           Control.Applicative ((<|>))
-import qualified Options.Applicative as Opt
-import qualified Prettyprinter as PP
+import Control.Applicative ((<|>))
+import Options.Applicative qualified as Opt
+import Prettyprinter qualified as PP
 
 parsePingCmd :: Opt.Mod Opt.CommandFields ClientCommand
 parsePingCmd =
diff --git a/cardano-cli/src/Cardano/CLI/Orphans.hs b/cardano-cli/src/Cardano/CLI/Orphans.hs
index 99b775728b..481c6ba30f 100644
--- a/cardano-cli/src/Cardano/CLI/Orphans.hs
+++ b/cardano-cli/src/Cardano/CLI/Orphans.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE StandaloneDeriving #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 
 module Cardano.CLI.Orphans
@@ -8,11 +7,11 @@ module Cardano.CLI.Orphans
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley (scriptDataToJsonDetailedSchema)
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley (scriptDataToJsonDetailedSchema)
 
-import           Data.Aeson
+import Data.Aeson
 
 -- TODO upstream this orphaned instance to the ledger
 instance (L.EraTxOut ledgerera, L.EraGov ledgerera) => ToJSON (L.NewEpochState ledgerera) where
diff --git a/cardano-cli/src/Cardano/CLI/Parser.hs b/cardano-cli/src/Cardano/CLI/Parser.hs
index 0ccb6f3212..f4d5a49fcf 100644
--- a/cardano-cli/src/Cardano/CLI/Parser.hs
+++ b/cardano-cli/src/Cardano/CLI/Parser.hs
@@ -18,20 +18,20 @@ module Cardano.CLI.Parser
   )
 where
 
-import qualified Cardano.Api.Ledger as L
-
-import           Cardano.CLI.Types.Common
-
-import qualified Data.Attoparsec.ByteString.Char8 as Atto
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString.Char8 as BSC
-import           Data.Char (toLower)
-import           Data.Foldable
-import           Data.Ratio ((%))
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import qualified Data.Text.Encoding as Text
-import qualified Options.Applicative as Opt
+import Cardano.Api.Ledger qualified as L
+
+import Cardano.CLI.Types.Common
+
+import Data.Attoparsec.ByteString.Char8 qualified as Atto
+import Data.ByteString (ByteString)
+import Data.ByteString.Char8 qualified as BSC
+import Data.Char (toLower)
+import Data.Foldable
+import Data.Ratio ((%))
+import Data.Text (Text)
+import Data.Text qualified as Text
+import Data.Text.Encoding qualified as Text
+import Options.Applicative qualified as Opt
 
 readIdOutputFormat :: Opt.ReadM IdOutputFormat
 readIdOutputFormat = do
diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs
index 7c7f8ebd17..176d3fe28f 100644
--- a/cardano-cli/src/Cardano/CLI/Read.hs
+++ b/cardano-cli/src/Cardano/CLI/Read.hs
@@ -5,7 +5,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeFamilies #-}
 
 module Cardano.CLI.Read
@@ -95,53 +94,55 @@ module Cardano.CLI.Read
   )
 where
 
-import           Cardano.Api as Api
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley as Api
-
-import qualified Cardano.Binary as CBOR
-import           Cardano.CLI.EraBased.Script.Proposal.Read
-import           Cardano.CLI.EraBased.Script.Proposal.Types (CliProposalScriptRequirements,
-                   ProposalScriptWitness)
-import           Cardano.CLI.EraBased.Script.Types
-import           Cardano.CLI.EraBased.Script.Vote.Read
-import           Cardano.CLI.EraBased.Script.Vote.Types
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.DelegationError
-import           Cardano.CLI.Types.Errors.PlutusScriptDecodeError
-import           Cardano.CLI.Types.Errors.ScriptDataError
-import           Cardano.CLI.Types.Errors.ScriptDecodeError
-import           Cardano.CLI.Types.Errors.StakeCredentialError
-import           Cardano.CLI.Types.Governance
-import           Cardano.CLI.Types.Key
-import qualified Cardano.Crypto.Hash as Crypto
-
-import           Prelude
-
-import           Control.Exception (bracket)
-import           Control.Monad (forM, unless, when)
-import qualified Data.Aeson as Aeson
-import           Data.Bifunctor
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString as BS
-import qualified Data.ByteString.Base16 as Base16
-import qualified Data.ByteString.Builder as Builder
-import qualified Data.ByteString.Lazy.Char8 as LBS
-import           Data.Function ((&))
-import           Data.IORef (IORef, newIORef, readIORef, writeIORef)
-import qualified Data.List as List
-import           Data.Proxy (Proxy (..))
-import           Data.String
-import           Data.Text (Text)
-import qualified Data.Text as T
-import qualified Data.Text as Text
-import qualified Data.Text.Encoding as Text
-import qualified Data.Text.Encoding.Error as Text
-import           Data.Word
-import           GHC.IO.Handle (hClose, hIsSeekable)
-import           GHC.IO.Handle.FD (openFileBlocking)
-import qualified Options.Applicative as Opt
-import           System.IO (IOMode (ReadMode))
+import Cardano.Api as Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley as Api
+
+import Cardano.Binary qualified as CBOR
+import Cardano.CLI.EraBased.Script.Proposal.Read
+import Cardano.CLI.EraBased.Script.Proposal.Types
+  ( CliProposalScriptRequirements
+  , ProposalScriptWitness
+  )
+import Cardano.CLI.EraBased.Script.Types
+import Cardano.CLI.EraBased.Script.Vote.Read
+import Cardano.CLI.EraBased.Script.Vote.Types
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.DelegationError
+import Cardano.CLI.Types.Errors.PlutusScriptDecodeError
+import Cardano.CLI.Types.Errors.ScriptDataError
+import Cardano.CLI.Types.Errors.ScriptDecodeError
+import Cardano.CLI.Types.Errors.StakeCredentialError
+import Cardano.CLI.Types.Governance
+import Cardano.CLI.Types.Key
+import Cardano.Crypto.Hash qualified as Crypto
+
+import Prelude
+
+import Control.Exception (bracket)
+import Control.Monad (forM, unless, when)
+import Data.Aeson qualified as Aeson
+import Data.Bifunctor
+import Data.ByteString (ByteString)
+import Data.ByteString qualified as BS
+import Data.ByteString.Base16 qualified as Base16
+import Data.ByteString.Builder qualified as Builder
+import Data.ByteString.Lazy.Char8 qualified as LBS
+import Data.Function ((&))
+import Data.IORef (IORef, newIORef, readIORef, writeIORef)
+import Data.List qualified as List
+import Data.Proxy (Proxy (..))
+import Data.String
+import Data.Text (Text)
+import Data.Text qualified as T
+import Data.Text qualified as Text
+import Data.Text.Encoding qualified as Text
+import Data.Text.Encoding.Error qualified as Text
+import Data.Word
+import GHC.IO.Handle (hClose, hIsSeekable)
+import GHC.IO.Handle.FD (openFileBlocking)
+import Options.Applicative qualified as Opt
+import System.IO (IOMode (ReadMode))
 
 -- Metadata
 
diff --git a/cardano-cli/src/Cardano/CLI/Render.hs b/cardano-cli/src/Cardano/CLI/Render.hs
index 5af2a8ff6f..5fd41aec60 100644
--- a/cardano-cli/src/Cardano/CLI/Render.hs
+++ b/cardano-cli/src/Cardano/CLI/Render.hs
@@ -6,17 +6,17 @@ module Cardano.CLI.Render
   )
 where
 
-import           Cardano.Api (textShow)
+import Cardano.Api (textShow)
 
-import           Data.Text (Text)
-import qualified Data.Text as T
-import           Options.Applicative
-import           Options.Applicative.Help.Ann
-import           Options.Applicative.Help.Types (helpText, renderHelp)
-import           Prettyprinter
-import           Prettyprinter.Render.Util.SimpleDocTree
-import qualified System.Environment as IO
-import qualified System.IO.Unsafe as IO
+import Data.Text (Text)
+import Data.Text qualified as T
+import Options.Applicative
+import Options.Applicative.Help.Ann
+import Options.Applicative.Help.Types (helpText, renderHelp)
+import Prettyprinter
+import Prettyprinter.Render.Util.SimpleDocTree
+import System.Environment qualified as IO
+import System.IO.Unsafe qualified as IO
 
 cliHelpTraceEnabled :: Bool
 cliHelpTraceEnabled = IO.unsafePerformIO $ do
diff --git a/cardano-cli/src/Cardano/CLI/Run.hs b/cardano-cli/src/Cardano/CLI/Run.hs
index 027db218c1..ca484e2584 100644
--- a/cardano-cli/src/Cardano/CLI/Run.hs
+++ b/cardano-cli/src/Cardano/CLI/Run.hs
@@ -11,48 +11,59 @@ module Cardano.CLI.Run
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Byron.Run (ByronClientCmdError, renderByronClientCmdError,
-                   runByronClientCommand)
-import           Cardano.CLI.Commands
-import           Cardano.CLI.Compatible.Commands
-import           Cardano.CLI.Compatible.Run
-import           Cardano.CLI.EraBased.Commands.TopLevelCommands
-import           Cardano.CLI.EraBased.Run
-import           Cardano.CLI.EraBased.Run.Query
-import           Cardano.CLI.Legacy.Commands
-import           Cardano.CLI.Legacy.Run (runLegacyCmds)
-import           Cardano.CLI.Render (customRenderHelp)
-import           Cardano.CLI.Run.Address
-import           Cardano.CLI.Run.Debug
-import           Cardano.CLI.Run.Hash (runHashCmds)
-import           Cardano.CLI.Run.Key
-import           Cardano.CLI.Run.Node
-import           Cardano.CLI.Run.Ping (PingClientCmdError (..), renderPingClientCmdError,
-                   runPingCmd)
-import           Cardano.CLI.Types.Errors.AddressCmdError
-import           Cardano.CLI.Types.Errors.CmdError
-import           Cardano.CLI.Types.Errors.HashCmdError
-import           Cardano.CLI.Types.Errors.KeyCmdError
-import           Cardano.CLI.Types.Errors.NodeCmdError
-import           Cardano.CLI.Types.Errors.QueryCmdError
-import           Cardano.Git.Rev (gitRev)
+import Cardano.CLI.Byron.Run
+  ( ByronClientCmdError
+  , renderByronClientCmdError
+  , runByronClientCommand
+  )
+import Cardano.CLI.Commands
+import Cardano.CLI.Compatible.Commands
+import Cardano.CLI.Compatible.Run
+import Cardano.CLI.EraBased.Commands.TopLevelCommands
+import Cardano.CLI.EraBased.Run
+import Cardano.CLI.EraBased.Run.Query
+import Cardano.CLI.Legacy.Commands
+import Cardano.CLI.Legacy.Run (runLegacyCmds)
+import Cardano.CLI.Render (customRenderHelp)
+import Cardano.CLI.Run.Address
+import Cardano.CLI.Run.Debug
+import Cardano.CLI.Run.Hash (runHashCmds)
+import Cardano.CLI.Run.Key
+import Cardano.CLI.Run.Node
+import Cardano.CLI.Run.Ping
+  ( PingClientCmdError (..)
+  , renderPingClientCmdError
+  , runPingCmd
+  )
+import Cardano.CLI.Types.Errors.AddressCmdError
+import Cardano.CLI.Types.Errors.CmdError
+import Cardano.CLI.Types.Errors.HashCmdError
+import Cardano.CLI.Types.Errors.KeyCmdError
+import Cardano.CLI.Types.Errors.NodeCmdError
+import Cardano.CLI.Types.Errors.QueryCmdError
+import Cardano.Git.Rev (gitRev)
 
-import           Control.Monad (forM_)
-import           Data.Function
-import qualified Data.List as L
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import qualified Data.Text.IO as Text
-import           Data.Version (showVersion)
-import           Options.Applicative.Help.Core
-import           Options.Applicative.Types (OptReader (..), Option (..), Parser (..),
-                   ParserInfo (..), ParserPrefs (..))
-import           System.Info (arch, compilerName, compilerVersion, os)
-import qualified System.IO as IO
+import Control.Monad (forM_)
+import Data.Function
+import Data.List qualified as L
+import Data.Text (Text)
+import Data.Text qualified as Text
+import Data.Text.IO qualified as Text
+import Data.Version (showVersion)
+import Options.Applicative.Help.Core
+import Options.Applicative.Types
+  ( OptReader (..)
+  , Option (..)
+  , Parser (..)
+  , ParserInfo (..)
+  , ParserPrefs (..)
+  )
+import System.IO qualified as IO
+import System.Info (arch, compilerName, compilerVersion, os)
 
-import           Paths_cardano_cli (version)
+import Paths_cardano_cli (version)
 
 data ClientCommandErrors
   = ByronClientError ByronClientCmdError
diff --git a/cardano-cli/src/Cardano/CLI/Run/Address.hs b/cardano-cli/src/Cardano/CLI/Run/Address.hs
index b4987074ed..2c72d5a038 100644
--- a/cardano-cli/src/Cardano/CLI/Run/Address.hs
+++ b/cardano-cli/src/Cardano/CLI/Run/Address.hs
@@ -15,23 +15,29 @@ module Cardano.CLI.Run.Address
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
-
-import           Cardano.CLI.Commands.Address
-import           Cardano.CLI.Read
-import           Cardano.CLI.Run.Address.Info
-import qualified Cardano.CLI.Run.Key as Key
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.AddressCmdError
-import           Cardano.CLI.Types.Key (PaymentVerifier (..), StakeIdentifier (..),
-                   StakeVerifier (..), VerificationKeyTextOrFile, generateKeyPair,
-                   readVerificationKeyOrHashOrFile, readVerificationKeyTextOrFileAnyOf)
-
-import           Control.Monad (void)
-import qualified Data.ByteString.Char8 as BS
-import           Data.Function
-import qualified Data.Text.IO as Text
+import Cardano.Api
+import Cardano.Api.Shelley
+
+import Cardano.CLI.Commands.Address
+import Cardano.CLI.Read
+import Cardano.CLI.Run.Address.Info
+import Cardano.CLI.Run.Key qualified as Key
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.AddressCmdError
+import Cardano.CLI.Types.Key
+  ( PaymentVerifier (..)
+  , StakeIdentifier (..)
+  , StakeVerifier (..)
+  , VerificationKeyTextOrFile
+  , generateKeyPair
+  , readVerificationKeyOrHashOrFile
+  , readVerificationKeyTextOrFileAnyOf
+  )
+
+import Control.Monad (void)
+import Data.ByteString.Char8 qualified as BS
+import Data.Function
+import Data.Text.IO qualified as Text
 
 runAddressCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/Run/Address/Info.hs b/cardano-cli/src/Cardano/CLI/Run/Address/Info.hs
index de097478d3..a4bc14b82f 100644
--- a/cardano-cli/src/Cardano/CLI/Run/Address/Info.hs
+++ b/cardano-cli/src/Cardano/CLI/Run/Address/Info.hs
@@ -6,15 +6,15 @@ module Cardano.CLI.Run.Address.Info
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Types.Errors.AddressInfoError
+import Cardano.CLI.Types.Errors.AddressInfoError
 
-import           Data.Aeson (ToJSON (..), object, (.=))
-import           Data.Aeson.Encode.Pretty (encodePretty)
-import qualified Data.ByteString.Lazy.Char8 as LBS
-import           Data.Text (Text)
-import           Options.Applicative (Alternative (..))
+import Data.Aeson (ToJSON (..), object, (.=))
+import Data.Aeson.Encode.Pretty (encodePretty)
+import Data.ByteString.Lazy.Char8 qualified as LBS
+import Data.Text (Text)
+import Options.Applicative (Alternative (..))
 
 data AddressInfo = AddressInfo
   { aiType :: !Text
diff --git a/cardano-cli/src/Cardano/CLI/Run/Debug.hs b/cardano-cli/src/Cardano/CLI/Run/Debug.hs
index 8816cd7a29..ada7022c63 100644
--- a/cardano-cli/src/Cardano/CLI/Run/Debug.hs
+++ b/cardano-cli/src/Cardano/CLI/Run/Debug.hs
@@ -7,13 +7,13 @@ module Cardano.CLI.Run.Debug
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Commands.Debug
-import           Cardano.CLI.Run.Debug.CheckNodeConfiguration (runCheckNodeConfig)
-import           Cardano.CLI.Run.Debug.LogEpochState
-import           Cardano.CLI.Run.Debug.TransactionView (runTransactionViewCmd)
-import           Cardano.CLI.Types.Errors.DebugCmdError
+import Cardano.CLI.Commands.Debug
+import Cardano.CLI.Run.Debug.CheckNodeConfiguration (runCheckNodeConfig)
+import Cardano.CLI.Run.Debug.LogEpochState
+import Cardano.CLI.Run.Debug.TransactionView (runTransactionViewCmd)
+import Cardano.CLI.Types.Errors.DebugCmdError
 
 runDebugCmds :: DebugCmds -> ExceptT DebugCmdError IO ()
 runDebugCmds = \case
diff --git a/cardano-cli/src/Cardano/CLI/Run/Debug/CheckNodeConfiguration.hs b/cardano-cli/src/Cardano/CLI/Run/Debug/CheckNodeConfiguration.hs
index 4c1f6ff552..901a246683 100644
--- a/cardano-cli/src/Cardano/CLI/Run/Debug/CheckNodeConfiguration.hs
+++ b/cardano-cli/src/Cardano/CLI/Run/Debug/CheckNodeConfiguration.hs
@@ -3,18 +3,18 @@
 
 module Cardano.CLI.Run.Debug.CheckNodeConfiguration (runCheckNodeConfig) where
 
-import           Cardano.Api
-import qualified Cardano.Api.Byron as Byron
+import Cardano.Api
+import Cardano.Api.Byron qualified as Byron
 
-import           Cardano.CLI.Commands.Debug.CheckNodeConfiguration
-import qualified Cardano.CLI.Read as Read
-import           Cardano.CLI.Types.Errors.DebugCmdError
-import qualified Cardano.Crypto.Hash as Crypto
+import Cardano.CLI.Commands.Debug.CheckNodeConfiguration
+import Cardano.CLI.Read qualified as Read
+import Cardano.CLI.Types.Errors.DebugCmdError
+import Cardano.Crypto.Hash qualified as Crypto
 
-import           Control.Monad
-import qualified Data.Text as Text
-import qualified Data.Yaml as Yaml
-import           System.FilePath (takeDirectory, (</>))
+import Control.Monad
+import Data.Text qualified as Text
+import Data.Yaml qualified as Yaml
+import System.FilePath (takeDirectory, (</>))
 
 runCheckNodeConfig :: CheckNodeConfigCmdArgs -> ExceptT DebugCmdError IO ()
 runCheckNodeConfig (CheckNodeConfigCmdArgs configFile) = do
diff --git a/cardano-cli/src/Cardano/CLI/Run/Debug/LogEpochState.hs b/cardano-cli/src/Cardano/CLI/Run/Debug/LogEpochState.hs
index d89e8a5d09..759b5941af 100644
--- a/cardano-cli/src/Cardano/CLI/Run/Debug/LogEpochState.hs
+++ b/cardano-cli/src/Cardano/CLI/Run/Debug/LogEpochState.hs
@@ -7,15 +7,15 @@ module Cardano.CLI.Run.Debug.LogEpochState
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api as Api
+import Cardano.Api
+import Cardano.Api qualified as Api
 
-import           Cardano.CLI.Commands.Debug.LogEpochState
-import           Cardano.CLI.Orphans ()
+import Cardano.CLI.Commands.Debug.LogEpochState
+import Cardano.CLI.Orphans ()
 
-import qualified Data.Aeson as Aeson
-import qualified Data.ByteString.Lazy as LBS
-import qualified System.IO as IO
+import Data.Aeson qualified as Aeson
+import Data.ByteString.Lazy qualified as LBS
+import System.IO qualified as IO
 
 runLogEpochStateCmd
   :: LogEpochStateCmdArgs
diff --git a/cardano-cli/src/Cardano/CLI/Run/Debug/TransactionView.hs b/cardano-cli/src/Cardano/CLI/Run/Debug/TransactionView.hs
index 771ca06c0f..dfe2d06d29 100644
--- a/cardano-cli/src/Cardano/CLI/Run/Debug/TransactionView.hs
+++ b/cardano-cli/src/Cardano/CLI/Run/Debug/TransactionView.hs
@@ -5,16 +5,19 @@ module Cardano.CLI.Run.Debug.TransactionView
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Commands.Debug.TransactionView
-import           Cardano.CLI.Json.Friendly (friendlyTx, friendlyTxBody,
-                   viewOutputFormatToFriendlyFormat)
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.TxCmdError
+import Cardano.CLI.Commands.Debug.TransactionView
+import Cardano.CLI.Json.Friendly
+  ( friendlyTx
+  , friendlyTxBody
+  , viewOutputFormatToFriendlyFormat
+  )
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.TxCmdError
 
-import           Data.Function ((&))
+import Data.Function ((&))
 
 runTransactionViewCmd
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/Run/Hash.hs b/cardano-cli/src/Cardano/CLI/Run/Hash.hs
index 9844e1a87d..667e1bce62 100644
--- a/cardano-cli/src/Cardano/CLI/Run/Hash.hs
+++ b/cardano-cli/src/Cardano/CLI/Run/Hash.hs
@@ -15,39 +15,44 @@ module Cardano.CLI.Run.Hash
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-
-import qualified Cardano.CLI.Commands.Hash as Cmd
-import           Cardano.CLI.Parser (stringToAnchorScheme)
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Common (AnchorScheme (..), GenesisFile (..), MustCheckHash (..),
-                   PotentiallyCheckedAnchor (..), SupportedSchemes)
-import           Cardano.CLI.Types.Errors.HashCmdError
-import           Cardano.Crypto.Hash (hashToTextAsHex)
-import qualified Cardano.Crypto.Hash as Crypto
-import           Cardano.Prelude (ByteString, first)
-
-import           Control.Exception (throw)
-import           Control.Monad (when)
-import           Control.Monad.Catch (Exception, Handler (Handler))
-import qualified Data.ByteString as BS
-import qualified Data.ByteString.Char8 as BS8
-import qualified Data.ByteString.Lazy as BSL
-import qualified Data.ByteString.Lazy.Char8 as BSL8
-import           Data.Function
-import           Data.List (intercalate)
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import qualified Data.Text.Encoding as Text
-import qualified Data.Text.IO as Text
-import           Network.HTTP.Client (Response (..), httpLbs, newManager, requestFromURI)
-import           Network.HTTP.Client.TLS (tlsManagerSettings)
-import           Network.HTTP.Types (Status (statusCode), statusMessage)
-import           Network.URI (URI (..), URIAuth (..), parseAbsoluteURI, pathSegments)
-import qualified System.Environment as IO
-import           System.FilePath ((</>))
-import           System.FilePath.Posix (isDrive)
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+
+import Cardano.CLI.Commands.Hash qualified as Cmd
+import Cardano.CLI.Parser (stringToAnchorScheme)
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Common
+  ( AnchorScheme (..)
+  , GenesisFile (..)
+  , MustCheckHash (..)
+  , PotentiallyCheckedAnchor (..)
+  , SupportedSchemes
+  )
+import Cardano.CLI.Types.Errors.HashCmdError
+import Cardano.Crypto.Hash (hashToTextAsHex)
+import Cardano.Crypto.Hash qualified as Crypto
+import Cardano.Prelude (ByteString, first)
+
+import Control.Exception (throw)
+import Control.Monad (when)
+import Control.Monad.Catch (Exception, Handler (Handler))
+import Data.ByteString qualified as BS
+import Data.ByteString.Char8 qualified as BS8
+import Data.ByteString.Lazy qualified as BSL
+import Data.ByteString.Lazy.Char8 qualified as BSL8
+import Data.Function
+import Data.List (intercalate)
+import Data.Text (Text)
+import Data.Text qualified as Text
+import Data.Text.Encoding qualified as Text
+import Data.Text.IO qualified as Text
+import Network.HTTP.Client (Response (..), httpLbs, newManager, requestFromURI)
+import Network.HTTP.Client.TLS (tlsManagerSettings)
+import Network.HTTP.Types (Status (statusCode), statusMessage)
+import Network.URI (URI (..), URIAuth (..), parseAbsoluteURI, pathSegments)
+import System.Environment qualified as IO
+import System.FilePath ((</>))
+import System.FilePath.Posix (isDrive)
 
 runHashCmds
   :: ()
diff --git a/cardano-cli/src/Cardano/CLI/Run/Key.hs b/cardano-cli/src/Cardano/CLI/Run/Key.hs
index 31cbede324..25f8e77e15 100644
--- a/cardano-cli/src/Cardano/CLI/Run/Key.hs
+++ b/cardano-cli/src/Cardano/CLI/Run/Key.hs
@@ -32,34 +32,34 @@ module Cardano.CLI.Run.Key
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Byron as ByronApi
-import           Cardano.Api.Crypto.Ed25519Bip32 (xPrvFromBytes)
-import qualified Cardano.Api.Ledger as L
-
-import qualified Cardano.CLI.Byron.Key as Byron
-import qualified Cardano.CLI.Commands.Key as Cmd
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.CardanoAddressSigningKeyConversionError
-import           Cardano.CLI.Types.Errors.ItnKeyConversionError
-import           Cardano.CLI.Types.Errors.KeyCmdError
-import           Cardano.CLI.Types.Key
-import qualified Cardano.Crypto.DSIGN as DSIGN
-import qualified Cardano.Crypto.Signing as Byron
-import qualified Cardano.Crypto.Signing as Byron.Crypto
-import qualified Cardano.Crypto.Signing as Crypto
-import qualified Cardano.Crypto.Wallet as Crypto
-
-import qualified Codec.Binary.Bech32 as Bech32
-import qualified Control.Exception as Exception
-import           Data.Bifunctor (Bifunctor (..))
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString as BS
-import           Data.Function
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import qualified Data.Text.Encoding as Text
-import           System.Exit (exitFailure)
+import Cardano.Api
+import Cardano.Api.Byron qualified as ByronApi
+import Cardano.Api.Crypto.Ed25519Bip32 (xPrvFromBytes)
+import Cardano.Api.Ledger qualified as L
+
+import Cardano.CLI.Byron.Key qualified as Byron
+import Cardano.CLI.Commands.Key qualified as Cmd
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.CardanoAddressSigningKeyConversionError
+import Cardano.CLI.Types.Errors.ItnKeyConversionError
+import Cardano.CLI.Types.Errors.KeyCmdError
+import Cardano.CLI.Types.Key
+import Cardano.Crypto.DSIGN qualified as DSIGN
+import Cardano.Crypto.Signing qualified as Byron
+import Cardano.Crypto.Signing qualified as Byron.Crypto
+import Cardano.Crypto.Signing qualified as Crypto
+import Cardano.Crypto.Wallet qualified as Crypto
+
+import Codec.Binary.Bech32 qualified as Bech32
+import Control.Exception qualified as Exception
+import Data.Bifunctor (Bifunctor (..))
+import Data.ByteString (ByteString)
+import Data.ByteString qualified as BS
+import Data.Function
+import Data.Text (Text)
+import Data.Text qualified as Text
+import Data.Text.Encoding qualified as Text
+import System.Exit (exitFailure)
 
 -- Note on these constants:
 -- https://github.com/IntersectMBO/cardano-cli/pull/416#discussion_r1378789737
diff --git a/cardano-cli/src/Cardano/CLI/Run/Node.hs b/cardano-cli/src/Cardano/CLI/Run/Node.hs
index b5f61da60c..efa687bde4 100644
--- a/cardano-cli/src/Cardano/CLI/Run/Node.hs
+++ b/cardano-cli/src/Cardano/CLI/Run/Node.hs
@@ -14,17 +14,17 @@ module Cardano.CLI.Run.Node
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Shelley
 
-import qualified Cardano.CLI.Commands.Node as Cmd
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.NodeCmdError
-import           Cardano.CLI.Types.Key
+import Cardano.CLI.Commands.Node qualified as Cmd
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.NodeCmdError
+import Cardano.CLI.Types.Key
 
-import qualified Data.ByteString.Char8 as BS
-import           Data.String (fromString)
-import           Data.Word (Word64)
+import Data.ByteString.Char8 qualified as BS
+import Data.String (fromString)
+import Data.Word (Word64)
 
 {- HLINT ignore "Reduce duplication" -}
 
diff --git a/cardano-cli/src/Cardano/CLI/Run/Ping.hs b/cardano-cli/src/Cardano/CLI/Run/Ping.hs
index 09c3e6695e..f321b07a2d 100644
--- a/cardano-cli/src/Cardano/CLI/Run/Ping.hs
+++ b/cardano-cli/src/Cardano/CLI/Run/Ping.hs
@@ -9,23 +9,23 @@ module Cardano.CLI.Run.Ping
   )
 where
 
-import           Cardano.Api
-
-import           Cardano.CLI.Commands.Ping
-import qualified Cardano.Network.Ping as CNP
-
-import           Control.Concurrent.Class.MonadSTM.Strict (StrictTMVar)
-import qualified Control.Concurrent.Class.MonadSTM.Strict as STM
-import           Control.Exception (SomeException)
-import           Control.Monad (forM, unless)
-import           Control.Monad.Class.MonadAsync (MonadAsync (async, wait, waitCatch))
-import           Control.Tracer (Tracer (..))
-import qualified Data.List as L
-import qualified Data.List as List
-import           Network.Socket (AddrInfo)
-import qualified Network.Socket as Socket
-import qualified System.Exit as IO
-import qualified System.IO as IO
+import Cardano.Api
+
+import Cardano.CLI.Commands.Ping
+import Cardano.Network.Ping qualified as CNP
+
+import Control.Concurrent.Class.MonadSTM.Strict (StrictTMVar)
+import Control.Concurrent.Class.MonadSTM.Strict qualified as STM
+import Control.Exception (SomeException)
+import Control.Monad (forM, unless)
+import Control.Monad.Class.MonadAsync (MonadAsync (async, wait, waitCatch))
+import Control.Tracer (Tracer (..))
+import Data.List qualified as L
+import Data.List qualified as List
+import Network.Socket (AddrInfo)
+import Network.Socket qualified as Socket
+import System.Exit qualified as IO
+import System.IO qualified as IO
 
 data PingClientCmdError
   = PingClientCmdError [(AddrInfo, SomeException)]
diff --git a/cardano-cli/src/Cardano/CLI/TopHandler.hs b/cardano-cli/src/Cardano/CLI/TopHandler.hs
index 2fd8d54e89..0ef64f5f64 100644
--- a/cardano-cli/src/Cardano/CLI/TopHandler.hs
+++ b/cardano-cli/src/Cardano/CLI/TopHandler.hs
@@ -45,12 +45,12 @@ where
 -- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 -- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import           Prelude
+import Prelude
 
-import           Control.Exception
-import           System.Environment
-import           System.Exit
-import           System.IO
+import Control.Exception
+import System.Environment
+import System.Exit
+import System.IO
 
 -- | An exception handler to use for a program top level, as an alternative to
 -- the default top level handler provided by GHC.
diff --git a/cardano-cli/src/Cardano/CLI/Types/Common.hs b/cardano-cli/src/Cardano/CLI/Types/Common.hs
index 7bd8f0cbca..e147f7bcc5 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Common.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Common.hs
@@ -4,7 +4,6 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE GeneralisedNewtypeDeriving #-}
 {-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE StandaloneDeriving #-}
 
 module Cardano.CLI.Types.Common
   ( AllOrOnly (..)
@@ -97,16 +96,16 @@ module Cardano.CLI.Types.Common
   )
 where
 
-import           Cardano.Api hiding (Script)
-import qualified Cardano.Api.Ledger as L
+import Cardano.Api hiding (Script)
+import Cardano.Api.Ledger qualified as L
 
-import           Data.Aeson (FromJSON (..), ToJSON (..), object, pairs, (.=))
-import qualified Data.Aeson as Aeson
-import           Data.String (IsString)
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import           Data.Word (Word64)
-import           GHC.Generics (Generic)
+import Data.Aeson (FromJSON (..), ToJSON (..), object, pairs, (.=))
+import Data.Aeson qualified as Aeson
+import Data.String (IsString)
+import Data.Text (Text)
+import Data.Text qualified as Text
+import Data.Word (Word64)
+import GHC.Generics (Generic)
 
 -- | Determines the direction in which the MIR certificate will transfer ADA.
 data TransferDirection
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/AddressCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/AddressCmdError.hs
index f9d5bf16f4..1b1c2fb73b 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/AddressCmdError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/AddressCmdError.hs
@@ -11,12 +11,14 @@ module Cardano.CLI.Types.Errors.AddressCmdError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Errors.AddressInfoError
-import           Cardano.CLI.Types.Key (VerificationKeyTextOrFileError (..),
-                   renderVerificationKeyTextOrFileError)
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Errors.AddressInfoError
+import Cardano.CLI.Types.Key
+  ( VerificationKeyTextOrFileError (..)
+  , renderVerificationKeyTextOrFileError
+  )
 
 data AddressCmdError
   = AddressCmdAddressInfoError !AddressInfoError
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/AddressInfoError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/AddressInfoError.hs
index bf43e1a913..f0ac9b511b 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/AddressInfoError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/AddressInfoError.hs
@@ -5,9 +5,9 @@ module Cardano.CLI.Types.Errors.AddressInfoError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 newtype AddressInfoError = ShelleyAddressInvalid Text
   deriving Show
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/BootstrapWitnessError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/BootstrapWitnessError.hs
index 6428a3a266..d5bf53b6b3 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/BootstrapWitnessError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/BootstrapWitnessError.hs
@@ -4,7 +4,7 @@ module Cardano.CLI.Types.Errors.BootstrapWitnessError
   )
 where
 
-import           Prettyprinter
+import Prettyprinter
 
 -- | Error constructing a Shelley bootstrap witness (i.e. a Byron key witness
 -- in the Shelley era).
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/CardanoAddressSigningKeyConversionError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/CardanoAddressSigningKeyConversionError.hs
index 5de4c358b3..41f355a38b 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/CardanoAddressSigningKeyConversionError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/CardanoAddressSigningKeyConversionError.hs
@@ -5,9 +5,9 @@ module Cardano.CLI.Types.Errors.CardanoAddressSigningKeyConversionError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Data.ByteString (ByteString)
+import Data.ByteString (ByteString)
 
 -- | An error that can occur while converting a @cardano-address@ extended
 -- signing key.
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/CmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/CmdError.hs
index 686b73caa1..08af0ccb19 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/CmdError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/CmdError.hs
@@ -6,27 +6,27 @@ module Cardano.CLI.Types.Errors.CmdError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Render
-import           Cardano.CLI.Types.Errors.AddressCmdError
-import           Cardano.CLI.Types.Errors.DelegationError
-import           Cardano.CLI.Types.Errors.GenesisCmdError
-import           Cardano.CLI.Types.Errors.GovernanceActionsError
-import           Cardano.CLI.Types.Errors.GovernanceCmdError
-import           Cardano.CLI.Types.Errors.GovernanceCommitteeError
-import           Cardano.CLI.Types.Errors.GovernanceQueryError
-import           Cardano.CLI.Types.Errors.GovernanceVoteCmdError
-import           Cardano.CLI.Types.Errors.KeyCmdError
-import           Cardano.CLI.Types.Errors.NodeCmdError
-import           Cardano.CLI.Types.Errors.QueryCmdError
-import           Cardano.CLI.Types.Errors.RegistrationError
-import           Cardano.CLI.Types.Errors.StakeAddressCmdError
-import           Cardano.CLI.Types.Errors.StakePoolCmdError
-import           Cardano.CLI.Types.Errors.TextViewFileError
-import           Cardano.CLI.Types.Errors.TxCmdError
+import Cardano.CLI.Render
+import Cardano.CLI.Types.Errors.AddressCmdError
+import Cardano.CLI.Types.Errors.DelegationError
+import Cardano.CLI.Types.Errors.GenesisCmdError
+import Cardano.CLI.Types.Errors.GovernanceActionsError
+import Cardano.CLI.Types.Errors.GovernanceCmdError
+import Cardano.CLI.Types.Errors.GovernanceCommitteeError
+import Cardano.CLI.Types.Errors.GovernanceQueryError
+import Cardano.CLI.Types.Errors.GovernanceVoteCmdError
+import Cardano.CLI.Types.Errors.KeyCmdError
+import Cardano.CLI.Types.Errors.NodeCmdError
+import Cardano.CLI.Types.Errors.QueryCmdError
+import Cardano.CLI.Types.Errors.RegistrationError
+import Cardano.CLI.Types.Errors.StakeAddressCmdError
+import Cardano.CLI.Types.Errors.StakePoolCmdError
+import Cardano.CLI.Types.Errors.TextViewFileError
+import Cardano.CLI.Types.Errors.TxCmdError
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data CmdError
   = CmdAddressError !AddressCmdError
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/DebugCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/DebugCmdError.hs
index 4a715ee1c2..fe61b5447a 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/DebugCmdError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/DebugCmdError.hs
@@ -5,14 +5,14 @@ module Cardano.CLI.Types.Errors.DebugCmdError
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Byron as Byron
+import Cardano.Api
+import Cardano.Api.Byron qualified as Byron
 
-import           Cardano.CLI.Types.Errors.TxCmdError
+import Cardano.CLI.Types.Errors.TxCmdError
 
-import           Data.Text (Text)
-import qualified Data.Text.Lazy.Builder as Text
-import           Formatting.Buildable (build)
+import Data.Text (Text)
+import Data.Text.Lazy.Builder qualified as Text
+import Formatting.Buildable (build)
 
 data DebugCmdError
   = DebugCmdFailed
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/DelegationError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/DelegationError.hs
index 5b1800ac61..e19599bba6 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/DelegationError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/DelegationError.hs
@@ -7,11 +7,11 @@ module Cardano.CLI.Types.Errors.DelegationError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Types.Errors.StakeCredentialError
+import Cardano.CLI.Types.Errors.StakeCredentialError
 
-import           GHC.Generics (Generic)
+import GHC.Generics (Generic)
 
 data DelegationError
   = DelegationReadError !(FileError InputDecodeError)
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GenesisCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/GenesisCmdError.hs
index a897a03172..e1ad297218 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/GenesisCmdError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/GenesisCmdError.hs
@@ -6,18 +6,18 @@ module Cardano.CLI.Types.Errors.GenesisCmdError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Byron.Genesis as Byron
-import           Cardano.CLI.EraBased.Run.Governance.Committee (GovernanceCommitteeError)
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.AddressCmdError
-import           Cardano.CLI.Types.Errors.NodeCmdError
-import           Cardano.CLI.Types.Errors.StakeAddressCmdError
-import           Cardano.CLI.Types.Errors.StakePoolCmdError
+import Cardano.CLI.Byron.Genesis as Byron
+import Cardano.CLI.EraBased.Run.Governance.Committee (GovernanceCommitteeError)
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.AddressCmdError
+import Cardano.CLI.Types.Errors.NodeCmdError
+import Cardano.CLI.Types.Errors.StakeAddressCmdError
+import Cardano.CLI.Types.Errors.StakePoolCmdError
 
-import           Control.Exception (IOException)
-import           Data.Text (Text)
+import Control.Exception (IOException)
+import Data.Text (Text)
 
 data GenesisCmdError
   = GenesisCmdAddressCmdError !AddressCmdError
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceActionsError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceActionsError.hs
index 8f95d996e8..9b412af0cd 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceActionsError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceActionsError.hs
@@ -6,14 +6,14 @@ module Cardano.CLI.Types.Errors.GovernanceActionsError
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
 
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Errors.HashCmdError (FetchURLError)
-import           Cardano.CLI.Types.Errors.StakeCredentialError
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError)
+import Cardano.CLI.Types.Errors.StakeCredentialError
 
-import           Control.Exception (displayException)
+import Control.Exception (displayException)
 
 data GovernanceActionsError
   = GovernanceActionsCmdConstitutionError ConstitutionError
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCmdError.hs
index f6f82d3801..784fd7e468 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCmdError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCmdError.hs
@@ -4,19 +4,19 @@
 
 module Cardano.CLI.Types.Errors.GovernanceCmdError where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Shelley
 
-import           Cardano.Binary (DecoderError)
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Errors.HashCmdError (FetchURLError, HashCheckError)
-import           Cardano.CLI.Types.Errors.StakeAddressCmdError
+import Cardano.Binary (DecoderError)
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError, HashCheckError)
+import Cardano.CLI.Types.Errors.StakeAddressCmdError
 
-import           Control.Exception (displayException)
-import qualified Data.List as List
-import           Data.Text (Text)
-import qualified Data.Text.Lazy.Builder as TL
-import qualified Formatting.Buildable as B
+import Control.Exception (displayException)
+import Data.List qualified as List
+import Data.Text (Text)
+import Data.Text.Lazy.Builder qualified as TL
+import Formatting.Buildable qualified as B
 
 data GovernanceCmdError
   = -- Voting related
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCommitteeError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCommitteeError.hs
index 648c1d312a..e4b136c628 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCommitteeError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceCommitteeError.hs
@@ -5,12 +5,12 @@ module Cardano.CLI.Types.Errors.GovernanceCommitteeError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Types.Errors.HashCmdError (HashCheckError)
-import           Cardano.CLI.Types.Errors.ScriptDecodeError
+import Cardano.CLI.Types.Errors.HashCmdError (HashCheckError)
+import Cardano.CLI.Types.Errors.ScriptDecodeError
 
-import           Control.Exception (displayException)
+import Control.Exception (displayException)
 
 data GovernanceCommitteeError
   = GovernanceCommitteeCmdKeyDecodeError InputDecodeError
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs
index f455fa0aa5..46c145cd70 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs
@@ -2,9 +2,9 @@
 
 module Cardano.CLI.Types.Errors.GovernanceQueryError where
 
-import           Cardano.Api
-import           Cardano.Api.Consensus (EraMismatch)
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Consensus (EraMismatch)
+import Cardano.Api.Shelley
 
 data GovernanceQueryError
   = GovernanceQueryWriteFileError !(FileError ())
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceVoteCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceVoteCmdError.hs
index df91fc9721..861c2599a9 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceVoteCmdError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceVoteCmdError.hs
@@ -4,16 +4,16 @@
 
 module Cardano.CLI.Types.Errors.GovernanceVoteCmdError where
 
-import           Cardano.Api.Shelley
+import Cardano.Api.Shelley
 
-import           Cardano.Binary (DecoderError)
-import           Cardano.CLI.EraBased.Script.Types
-import           Cardano.CLI.Read (VoteError)
-import           Cardano.CLI.Types.Errors.HashCmdError (HashCheckError)
+import Cardano.Binary (DecoderError)
+import Cardano.CLI.EraBased.Script.Types
+import Cardano.CLI.Read (VoteError)
+import Cardano.CLI.Types.Errors.HashCmdError (HashCheckError)
 
-import           Control.Exception (displayException)
-import qualified Data.Text.Lazy.Builder as TL
-import qualified Formatting.Buildable as B
+import Control.Exception (displayException)
+import Data.Text.Lazy.Builder qualified as TL
+import Formatting.Buildable qualified as B
 
 data GovernanceVoteCmdError
   = GovernanceVoteCmdReadVerificationKeyError !(FileError InputDecodeError)
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/HashCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/HashCmdError.hs
index d4da8a105f..b0e4c196d5 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/HashCmdError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/HashCmdError.hs
@@ -9,13 +9,13 @@ module Cardano.CLI.Types.Errors.HashCmdError
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
 
-import           Cardano.CLI.Read (ScriptDecodeError)
-import           Cardano.Prelude (Exception (displayException), IOException)
+import Cardano.CLI.Read (ScriptDecodeError)
+import Cardano.Prelude (Exception (displayException), IOException)
 
-import           Network.HTTP.Client (HttpException)
+import Network.HTTP.Client (HttpException)
 
 data HashCmdError
   = HashMismatchedHashError
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/ItnKeyConversionError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/ItnKeyConversionError.hs
index 922c112611..eef6877ee2 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/ItnKeyConversionError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/ItnKeyConversionError.hs
@@ -10,11 +10,11 @@ module Cardano.CLI.Types.Errors.ItnKeyConversionError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Control.Exception (Exception (..), IOException)
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString.Char8 as BSC
+import Control.Exception (Exception (..), IOException)
+import Data.ByteString (ByteString)
+import Data.ByteString.Char8 qualified as BSC
 
 -- | An error that can occur while converting an Incentivized Testnet (ITN)
 -- key.
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/KeyCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/KeyCmdError.hs
index a1ac6de59e..a46449c0d8 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/KeyCmdError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/KeyCmdError.hs
@@ -9,14 +9,14 @@ module Cardano.CLI.Types.Errors.KeyCmdError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import qualified Cardano.CLI.Byron.Key as Byron
-import           Cardano.CLI.Types.Errors.CardanoAddressSigningKeyConversionError
-import           Cardano.CLI.Types.Errors.ItnKeyConversionError
-import           Cardano.CLI.Types.Key
+import Cardano.CLI.Byron.Key qualified as Byron
+import Cardano.CLI.Types.Errors.CardanoAddressSigningKeyConversionError
+import Cardano.CLI.Types.Errors.ItnKeyConversionError
+import Cardano.CLI.Types.Key
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data KeyCmdError
   = KeyCmdReadFileError !(FileError TextEnvelopeError)
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/NodeCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/NodeCmdError.hs
index 8e4edaf199..4426000ab0 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/NodeCmdError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/NodeCmdError.hs
@@ -7,7 +7,7 @@ module Cardano.CLI.Types.Errors.NodeCmdError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
 {- HLINT ignore "Reduce duplication" -}
 
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/NodeEraMismatchError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/NodeEraMismatchError.hs
index 6717997c77..5c07dc9af4 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/NodeEraMismatchError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/NodeEraMismatchError.hs
@@ -5,7 +5,7 @@ module Cardano.CLI.Types.Errors.NodeEraMismatchError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
 data NodeEraMismatchError
   = forall era nodeEra.
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/PlutusScriptDecodeError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/PlutusScriptDecodeError.hs
index 8f010128b9..4dc93e2194 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/PlutusScriptDecodeError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/PlutusScriptDecodeError.hs
@@ -5,9 +5,9 @@ module Cardano.CLI.Types.Errors.PlutusScriptDecodeError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data PlutusScriptDecodeError
   = PlutusScriptDecodeErrorUnknownVersion !Text
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/ProtocolParamsError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/ProtocolParamsError.hs
index f89f9fe1d6..7023473cee 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/ProtocolParamsError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/ProtocolParamsError.hs
@@ -10,9 +10,9 @@ module Cardano.CLI.Types.Errors.ProtocolParamsError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 data ProtocolParamsError
   = ProtocolParamsErrorFile (FileError ())
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs
index 1589963411..dbe642afbc 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs
@@ -16,18 +16,18 @@ module Cardano.CLI.Types.Errors.QueryCmdError
   )
 where
 
-import           Cardano.Api hiding (QueryInShelleyBasedEra (..))
-import           Cardano.Api.Consensus as Consensus (EraMismatch (..), PastHorizonException)
-import           Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
+import Cardano.Api hiding (QueryInShelleyBasedEra (..))
+import Cardano.Api.Consensus as Consensus (EraMismatch (..), PastHorizonException)
+import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
 
-import           Cardano.Binary (DecoderError)
-import           Cardano.CLI.Helpers (HelpersError (..), renderHelpersError)
-import           Cardano.CLI.Types.Errors.GenesisCmdError
-import           Cardano.CLI.Types.Errors.NodeEraMismatchError (NodeEraMismatchError (..))
+import Cardano.Binary (DecoderError)
+import Cardano.CLI.Helpers (HelpersError (..), renderHelpersError)
+import Cardano.CLI.Types.Errors.GenesisCmdError
+import Cardano.CLI.Types.Errors.NodeEraMismatchError (NodeEraMismatchError (..))
 
-import qualified Data.ByteString.Lazy.Char8 as LBS
-import           Data.Text.Lazy.Builder (toLazyText)
-import           Formatting.Buildable (build)
+import Data.ByteString.Lazy.Char8 qualified as LBS
+import Data.Text.Lazy.Builder (toLazyText)
+import Formatting.Buildable (build)
 
 {- HLINT ignore "Move brackets to avoid $" -}
 {- HLINT ignore "Redundant flip" -}
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/RegistrationError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/RegistrationError.hs
index be2233db3c..750c543125 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/RegistrationError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/RegistrationError.hs
@@ -5,14 +5,14 @@ module Cardano.CLI.Types.Errors.RegistrationError
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
 
-import           Cardano.CLI.Types.Errors.HashCmdError (FetchURLError, HashCheckError)
-import           Cardano.CLI.Types.Errors.StakeAddressRegistrationError
-import           Cardano.CLI.Types.Errors.StakeCredentialError
+import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError, HashCheckError)
+import Cardano.CLI.Types.Errors.StakeAddressRegistrationError
+import Cardano.CLI.Types.Errors.StakeCredentialError
 
-import           Control.Exception (displayException)
+import Control.Exception (displayException)
 
 data RegistrationError
   = RegistrationReadError !(FileError InputDecodeError)
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDataError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDataError.hs
index e80265297c..1224b7b42f 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDataError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDataError.hs
@@ -6,9 +6,9 @@ module Cardano.CLI.Types.Errors.ScriptDataError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import qualified Cardano.Binary as CBOR
+import Cardano.Binary qualified as CBOR
 
 data ScriptDataError
   = ScriptDataErrorFile (FileError ())
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDecodeError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDecodeError.hs
index b320c5715f..c73ab6bb4d 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDecodeError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDecodeError.hs
@@ -5,9 +5,9 @@ module Cardano.CLI.Types.Errors.ScriptDecodeError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Data.Text
+import Data.Text
 
 --
 -- Handling decoding the variety of script languages and formats
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressCmdError.hs
index 50b163fdd7..76673cfe68 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressCmdError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressCmdError.hs
@@ -5,12 +5,12 @@ module Cardano.CLI.Types.Errors.StakeAddressCmdError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Types.Errors.DelegationError
-import           Cardano.CLI.Types.Errors.ScriptDecodeError
-import           Cardano.CLI.Types.Errors.StakeAddressRegistrationError
-import           Cardano.CLI.Types.Errors.StakeCredentialError
+import Cardano.CLI.Types.Errors.DelegationError
+import Cardano.CLI.Types.Errors.ScriptDecodeError
+import Cardano.CLI.Types.Errors.StakeAddressRegistrationError
+import Cardano.CLI.Types.Errors.StakeCredentialError
 
 data StakeAddressCmdError
   = StakeAddressCmdReadKeyFileError !(FileError InputDecodeError)
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressDelegationError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressDelegationError.hs
index ad4e008c1c..efc917e0b7 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressDelegationError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressDelegationError.hs
@@ -6,7 +6,7 @@ module Cardano.CLI.Types.Errors.StakeAddressDelegationError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
 newtype StakeAddressDelegationError = VoteDelegationNotSupported (EraInEon ShelleyToBabbageEra)
   deriving Show
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressRegistrationError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressRegistrationError.hs
index cd027e6600..70ea70801e 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressRegistrationError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressRegistrationError.hs
@@ -5,7 +5,7 @@ module Cardano.CLI.Types.Errors.StakeAddressRegistrationError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
 data StakeAddressRegistrationError = StakeAddressRegistrationDepositRequired
   deriving Show
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeCredentialError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/StakeCredentialError.hs
index 047d4ed529..0d43a7a537 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeCredentialError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/StakeCredentialError.hs
@@ -5,9 +5,9 @@ module Cardano.CLI.Types.Errors.StakeCredentialError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Types.Errors.ScriptDecodeError
+import Cardano.CLI.Types.Errors.ScriptDecodeError
 
 data StakeCredentialError
   = StakeCredentialScriptDecodeError (FileError ScriptDecodeError)
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/StakePoolCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/StakePoolCmdError.hs
index d3bdd9e20c..1f3bc20839 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/StakePoolCmdError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/StakePoolCmdError.hs
@@ -9,10 +9,10 @@ module Cardano.CLI.Types.Errors.StakePoolCmdError
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley (Hash (StakePoolMetadataHash))
+import Cardano.Api
+import Cardano.Api.Shelley (Hash (StakePoolMetadataHash))
 
-import           Cardano.CLI.Types.Errors.HashCmdError (FetchURLError)
+import Cardano.CLI.Types.Errors.HashCmdError (FetchURLError)
 
 data StakePoolCmdError
   = StakePoolCmdReadFileError !(FileError TextEnvelopeError)
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/TextViewFileError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/TextViewFileError.hs
index 4048272da2..ba12230dae 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/TextViewFileError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/TextViewFileError.hs
@@ -7,9 +7,9 @@ module Cardano.CLI.Types.Errors.TextViewFileError
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Helpers (HelpersError, renderHelpersError)
+import Cardano.CLI.Helpers (HelpersError, renderHelpersError)
 
 data TextViewFileError
   = TextViewReadFileError (FileError TextEnvelopeError)
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs
index 4cab482d39..8e38146925 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs
@@ -14,27 +14,27 @@ module Cardano.CLI.Types.Errors.TxCmdError
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Consensus (EraMismatch (..))
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Consensus (EraMismatch (..))
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.EraBased.Script.Spend.Read
-import           Cardano.CLI.EraBased.Script.Types
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Errors.BootstrapWitnessError
-import           Cardano.CLI.Types.Errors.HashCmdError (HashCheckError)
-import           Cardano.CLI.Types.Errors.NodeEraMismatchError
-import qualified Cardano.CLI.Types.Errors.NodeEraMismatchError as NEM
-import           Cardano.CLI.Types.Errors.ProtocolParamsError
-import           Cardano.CLI.Types.Errors.TxValidationError
-import           Cardano.CLI.Types.Output
-import           Cardano.CLI.Types.TxFeature
-import qualified Cardano.Prelude as List
+import Cardano.CLI.EraBased.Script.Spend.Read
+import Cardano.CLI.EraBased.Script.Types
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Errors.BootstrapWitnessError
+import Cardano.CLI.Types.Errors.HashCmdError (HashCheckError)
+import Cardano.CLI.Types.Errors.NodeEraMismatchError
+import Cardano.CLI.Types.Errors.NodeEraMismatchError qualified as NEM
+import Cardano.CLI.Types.Errors.ProtocolParamsError
+import Cardano.CLI.Types.Errors.TxValidationError
+import Cardano.CLI.Types.Output
+import Cardano.CLI.Types.TxFeature
+import Cardano.Prelude qualified as List
 
-import           Data.Set (Set)
-import           Data.Text (Text)
+import Data.Set (Set)
+import Data.Text (Text)
 
 {- HLINT ignore "Use let" -}
 
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs
index 270db022c7..54554967f5 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs
@@ -23,16 +23,16 @@ module Cardano.CLI.Types.Errors.TxValidationError
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Common
 
-import           Prelude
+import Prelude
 
-import           Data.Bifunctor (first)
-import qualified Data.Text as T
-import           Prettyprinter (viaShow)
+import Data.Bifunctor (first)
+import Data.Text qualified as T
+import Prettyprinter (viaShow)
 
 data ScriptLanguageValidationError
   = ScriptLanguageValidationError AnyScriptLanguage AnyCardanoEra
diff --git a/cardano-cli/src/Cardano/CLI/Types/Governance.hs b/cardano-cli/src/Cardano/CLI/Types/Governance.hs
index 7173121ac1..5ead9d672d 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Governance.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Governance.hs
@@ -3,11 +3,14 @@
 
 module Cardano.CLI.Types.Governance where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
-
-import           Cardano.CLI.Types.Key (DRepHashSource, VerificationKeyOrHashOrFile,
-                   VerificationKeyOrHashOrFileOrScriptHash)
+import Cardano.Api
+import Cardano.Api.Shelley
+
+import Cardano.CLI.Types.Key
+  ( DRepHashSource
+  , VerificationKeyOrHashOrFile
+  , VerificationKeyOrHashOrFileOrScriptHash
+  )
 
 data ConwayVote
 
diff --git a/cardano-cli/src/Cardano/CLI/Types/Key.hs b/cardano-cli/src/Cardano/CLI/Types/Key.hs
index 19f50de054..875d5de4af 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Key.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Key.hs
@@ -44,17 +44,17 @@ module Cardano.CLI.Types.Key
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Common
 
-import           Data.Bifunctor (Bifunctor (..))
-import qualified Data.ByteString as BS
-import           Data.Text (Text)
-import qualified Data.Text.Encoding as Text
-import           GHC.Exts (IsList (..))
+import Data.Bifunctor (Bifunctor (..))
+import Data.ByteString qualified as BS
+import Data.Text (Text)
+import Data.Text.Encoding qualified as Text
+import GHC.Exts (IsList (..))
 
 ------------------------------------------------------------------------------
 -- Verification key deserialisation
diff --git a/cardano-cli/src/Cardano/CLI/Types/Key/VerificationKey.hs b/cardano-cli/src/Cardano/CLI/Types/Key/VerificationKey.hs
index a985475534..864474e916 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Key/VerificationKey.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Key/VerificationKey.hs
@@ -6,9 +6,9 @@ module Cardano.CLI.Types.Key.VerificationKey
   )
 where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 -- | A bech32 text encoded verification key of an unspecified key role.
 newtype AnyVerificationKeyText = AnyVerificationKeyText
diff --git a/cardano-cli/src/Cardano/CLI/Types/MonadWarning.hs b/cardano-cli/src/Cardano/CLI/Types/MonadWarning.hs
index eb100d82f4..c0efc1a74b 100644
--- a/cardano-cli/src/Cardano/CLI/Types/MonadWarning.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/MonadWarning.hs
@@ -47,10 +47,10 @@ module Cardano.CLI.Types.MonadWarning
   )
 where
 
-import           Control.Monad.IO.Class (MonadIO, liftIO)
-import           Control.Monad.State (MonadState (..))
-import           Control.Monad.Trans.State (StateT)
-import           System.IO (hPutStrLn, stderr)
+import Control.Monad.IO.Class (MonadIO, liftIO)
+import Control.Monad.State (MonadState (..))
+import Control.Monad.Trans.State (StateT)
+import System.IO (hPutStrLn, stderr)
 
 -- | Type class for monads that support reporting warnings without aborting
 -- their execution in the process.
diff --git a/cardano-cli/src/Cardano/CLI/Types/Output.hs b/cardano-cli/src/Cardano/CLI/Types/Output.hs
index db95b8dad6..392693443f 100644
--- a/cardano-cli/src/Cardano/CLI/Types/Output.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/Output.hs
@@ -17,22 +17,22 @@ module Cardano.CLI.Types.Output
   )
 where
 
-import           Cardano.Api
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Common
 
-import           Prelude
+import Prelude
 
-import           Data.Aeson
-import qualified Data.Aeson.Key as Aeson
-import           Data.Map.Strict (Map)
-import qualified Data.Map.Strict as Map
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import           Data.Time.Clock (UTCTime)
-import           Data.Word
+import Data.Aeson
+import Data.Aeson.Key qualified as Aeson
+import Data.Map.Strict (Map)
+import Data.Map.Strict qualified as Map
+import Data.Text (Text)
+import Data.Text qualified as Text
+import Data.Time.Clock (UTCTime)
+import Data.Word
 
 data QueryKesPeriodInfoOutput
   = QueryKesPeriodInfoOutput
diff --git a/cardano-cli/src/Cardano/CLI/Types/TxFeature.hs b/cardano-cli/src/Cardano/CLI/Types/TxFeature.hs
index 28f7491cf6..e8033c4654 100644
--- a/cardano-cli/src/Cardano/CLI/Types/TxFeature.hs
+++ b/cardano-cli/src/Cardano/CLI/Types/TxFeature.hs
@@ -6,7 +6,7 @@ module Cardano.CLI.Types.TxFeature
   )
 where
 
-import           Data.Text (Text)
+import Data.Text (Text)
 
 -- | An enumeration of era-dependent features where we have to check that it
 -- is permissible to use this feature in this era.
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Babbage/Transaction/CalculateMinFee.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Babbage/Transaction/CalculateMinFee.hs
index eba767a054..384ddea08f 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Babbage/Transaction/CalculateMinFee.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Babbage/Transaction/CalculateMinFee.hs
@@ -5,10 +5,10 @@ module Test.Golden.Babbage.Transaction.CalculateMinFee
   )
 where
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/SigningKeys.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/SigningKeys.hs
index 2f23345600..c9d7b82985 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/SigningKeys.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/SigningKeys.hs
@@ -12,23 +12,23 @@ module Test.Golden.Byron.SigningKeys
   )
 where
 
-import           Cardano.Api.Byron
+import Cardano.Api.Byron
 
-import           Cardano.CLI.Byron.Key (readByronSigningKey)
-import           Cardano.CLI.Byron.Legacy (decodeLegacyDelegateKey)
-import           Cardano.CLI.Types.Common
-import qualified Cardano.Crypto.Signing as Crypto
+import Cardano.CLI.Byron.Key (readByronSigningKey)
+import Cardano.CLI.Byron.Legacy (decodeLegacyDelegateKey)
+import Cardano.CLI.Types.Common
+import Cardano.Crypto.Signing qualified as Crypto
 
-import           Codec.CBOR.Read (deserialiseFromBytes)
-import           Control.Monad (void)
-import qualified Data.ByteString.Lazy as LB
+import Codec.CBOR.Read (deserialiseFromBytes)
+import Control.Monad (void)
+import Data.ByteString.Lazy qualified as LB
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property, property, success)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
-import           Hedgehog.Internal.Property (failWith)
+import Hedgehog (Property, property, success)
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Internal.Property (failWith)
 
 hprop_deserialise_legacy_signing_Key :: Property
 hprop_deserialise_legacy_signing_Key = propertyOnce $ do
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Tx.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Tx.hs
index 19ae5135df..6e3eb460aa 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Tx.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Tx.hs
@@ -2,20 +2,20 @@
 
 module Test.Golden.Byron.Tx where
 
-import           Cardano.Api
-import           Cardano.Api.Byron (ATxAux)
+import Cardano.Api
+import Cardano.Api.Byron (ATxAux)
 
-import           Cardano.CLI.Byron.Tx
+import Cardano.CLI.Byron.Tx
 
-import           Control.Monad (void)
-import           Data.ByteString (ByteString)
-import           GHC.Stack
+import Control.Monad (void)
+import Data.ByteString (ByteString)
+import GHC.Stack
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (MonadTest, Property, (===))
-import qualified Hedgehog.Extras.Test.Base as H
-import           Hedgehog.Internal.Property (failWith)
+import Hedgehog (MonadTest, Property, (===))
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Internal.Property (failWith)
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/TxBody.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/TxBody.hs
index c8a975158b..279930a2d5 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/TxBody.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/TxBody.hs
@@ -1,6 +1,6 @@
 module Test.Golden.Byron.TxBody where
 
-import           Hedgehog (Property, property, success)
+import Hedgehog (Property, property, success)
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/UpdateProposal.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/UpdateProposal.hs
index aefc49c96c..1f69a8648b 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/UpdateProposal.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/UpdateProposal.hs
@@ -2,17 +2,17 @@
 
 module Test.Golden.Byron.UpdateProposal where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Byron.UpdateProposal
+import Cardano.CLI.Byron.UpdateProposal
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property, (===))
-import qualified Hedgehog.Extras.Test.Base as H
-import           Hedgehog.Internal.Property (failWith)
+import Hedgehog (Property, (===))
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Internal.Property (failWith)
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Vote.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Vote.hs
index 118d2a3e00..e63573d901 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Vote.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Vote.hs
@@ -2,17 +2,17 @@
 
 module Test.Golden.Byron.Vote where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Byron.Vote
+import Cardano.CLI.Byron.Vote
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property, (===))
-import qualified Hedgehog.Extras.Test.Base as H
-import           Hedgehog.Internal.Property (failWith)
+import Hedgehog (Property, (===))
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Internal.Property (failWith)
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Witness.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Witness.hs
index 586311514a..42014e4182 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Witness.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Byron/Witness.hs
@@ -1,6 +1,6 @@
 module Test.Golden.Byron.Witness where
 
-import           Hedgehog (Property, property, success)
+import Hedgehog (Property, property, success)
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Conway/Transaction/Assemble.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Conway/Transaction/Assemble.hs
index 6e31d431db..8905bb3d33 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Conway/Transaction/Assemble.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Conway/Transaction/Assemble.hs
@@ -2,13 +2,13 @@
 
 module Test.Golden.Conway.Transaction.Assemble where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Conway/Transaction/BuildRaw.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Conway/Transaction/BuildRaw.hs
index fa209e2bf8..13ba7992f4 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Conway/Transaction/BuildRaw.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Conway/Transaction/BuildRaw.hs
@@ -2,16 +2,16 @@
 
 module Test.Golden.Conway.Transaction.BuildRaw where
 
-import           Control.Monad (void)
-import           Data.List (isInfixOf)
-import           System.Exit (ExitCode (..))
+import Control.Monad (void)
+import Data.List (isInfixOf)
+import System.Exit (ExitCode (..))
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/CreateStaked.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/CreateStaked.hs
index 625761fc0c..058b46aded 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/CreateStaked.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/CreateStaked.hs
@@ -2,24 +2,24 @@
 
 module Test.Golden.CreateStaked where
 
-import           Cardano.Api.Ledger (ShelleyGenesisStaking (sgsPools, sgsStake), StandardCrypto)
-import           Cardano.Api.Shelley (ShelleyGenesis (sgNetworkMagic, sgStaking))
+import Cardano.Api.Ledger (ShelleyGenesisStaking (sgsPools, sgsStake), StandardCrypto)
+import Cardano.Api.Shelley (ShelleyGenesis (sgNetworkMagic, sgStaking))
 
-import           Control.Monad (filterM, void)
-import           Control.Monad.IO.Class
-import qualified Data.Aeson as Aeson
-import qualified Data.ByteString.Lazy as LBS
-import           Data.List (intercalate, sort)
-import           System.Directory
-import           System.FilePath
+import Control.Monad (filterM, void)
+import Control.Monad.IO.Class
+import Data.Aeson qualified as Aeson
+import Data.ByteString.Lazy qualified as LBS
+import Data.List (intercalate, sort)
+import System.Directory
+import System.FilePath
 
-import           Test.Cardano.CLI.Util (execCardanoCLI)
+import Test.Cardano.CLI.Util (execCardanoCLI)
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import           Hedgehog.Extras (moduleWorkspace, propertyOnce)
-import qualified Hedgehog.Extras as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras (moduleWorkspace, propertyOnce)
+import Hedgehog.Extras qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/CreateTestnetData.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/CreateTestnetData.hs
index c6676dda1e..c282545cd6 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/CreateTestnetData.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/CreateTestnetData.hs
@@ -4,28 +4,28 @@
 
 module Test.Golden.CreateTestnetData where
 
-import           Cardano.Api
-import           Cardano.Api.Ledger (ConwayGenesis (..), StandardCrypto)
-import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley (ShelleyGenesis (..))
-
-import           Control.Monad
-import           Data.List (intercalate, sort)
-import qualified Data.Sequence.Strict as Seq
-import           Data.Word (Word32)
-import           GHC.Exts (IsList (..))
-import           System.Directory
-import           System.Directory.Extra (listDirectories)
-import           System.FilePath
-
-import           Test.Cardano.CLI.Aeson
-import           Test.Cardano.CLI.Util (execCardanoCLI)
-
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import           Hedgehog.Extras (moduleWorkspace, propertyOnce)
-import qualified Hedgehog.Extras as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Cardano.Api
+import Cardano.Api.Ledger (ConwayGenesis (..), StandardCrypto)
+import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Shelley (ShelleyGenesis (..))
+
+import Control.Monad
+import Data.List (intercalate, sort)
+import Data.Sequence.Strict qualified as Seq
+import Data.Word (Word32)
+import GHC.Exts (IsList (..))
+import System.Directory
+import System.Directory.Extra (listDirectories)
+import System.FilePath
+
+import Test.Cardano.CLI.Aeson
+import Test.Cardano.CLI.Util (execCardanoCLI)
+
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras (moduleWorkspace, propertyOnce)
+import Hedgehog.Extras qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Redundant bracket" -}
 {- HLINT ignore "Use camelCase" -}
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/AnswerPoll.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/AnswerPoll.hs
index ed4a684db9..b403529c26 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/AnswerPoll.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/AnswerPoll.hs
@@ -2,15 +2,15 @@
 
 module Test.Golden.EraBased.Governance.AnswerPoll where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/CreatePoll.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/CreatePoll.hs
index 8f4c7289fa..8a1d013a54 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/CreatePoll.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/CreatePoll.hs
@@ -2,15 +2,15 @@
 
 module Test.Golden.EraBased.Governance.CreatePoll where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/VerifyPoll.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/VerifyPoll.hs
index 889269ecac..0a62029cde 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/VerifyPoll.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/EraBased/Governance/VerifyPoll.hs
@@ -3,19 +3,21 @@
 
 module Test.Golden.EraBased.Governance.VerifyPoll where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Cardano.CLI.Types.Key (VerificationKeyOrFile (..),
-                   readVerificationKeyOrTextEnvFile)
+import Cardano.CLI.Types.Key
+  ( VerificationKeyOrFile (..)
+  , readVerificationKeyOrTextEnvFile
+  )
 
-import qualified Data.ByteString.Char8 as BSC
+import Data.ByteString.Char8 qualified as BSC
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras as H
-import qualified Hedgehog.Internal.Property as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras qualified as H
+import Hedgehog.Internal.Property qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/ErrorsSpec.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/ErrorsSpec.hs
index 01e1a05de3..43d6cce034 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/ErrorsSpec.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/ErrorsSpec.hs
@@ -11,27 +11,27 @@ module Test.Golden.ErrorsSpec
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Shelley
+import Cardano.Api
+import Cardano.Api.Shelley
 
-import           Cardano.Binary
-import           Cardano.CLI.EraBased.Run.Governance.Actions
-import           Cardano.CLI.EraBased.Run.Governance.Committee
-import           Cardano.CLI.EraBased.Script.Types
-import           Cardano.CLI.Read
-import           Cardano.CLI.Types.Errors.DelegationError
-import           Cardano.CLI.Types.Errors.GovernanceCmdError
-import           Cardano.CLI.Types.Errors.GovernanceVoteCmdError
-import           Cardano.CLI.Types.Errors.RegistrationError
-import           Cardano.CLI.Types.Errors.StakeAddressCmdError
-import           Cardano.CLI.Types.Errors.StakeAddressRegistrationError
-import           Cardano.CLI.Types.Errors.StakeCredentialError
+import Cardano.Binary
+import Cardano.CLI.EraBased.Run.Governance.Actions
+import Cardano.CLI.EraBased.Run.Governance.Committee
+import Cardano.CLI.EraBased.Script.Types
+import Cardano.CLI.Read
+import Cardano.CLI.Types.Errors.DelegationError
+import Cardano.CLI.Types.Errors.GovernanceCmdError
+import Cardano.CLI.Types.Errors.GovernanceVoteCmdError
+import Cardano.CLI.Types.Errors.RegistrationError
+import Cardano.CLI.Types.Errors.StakeAddressCmdError
+import Cardano.CLI.Types.Errors.StakeAddressRegistrationError
+import Cardano.CLI.Types.Errors.StakeCredentialError
 
-import           Data.Text.Encoding.Error
-import           GHC.Stack (HasCallStack)
+import Data.Text.Encoding.Error
+import GHC.Stack (HasCallStack)
 
-import qualified Test.Hedgehog.Golden.ErrorMessage as ErrorMessage
-import           Test.Tasty
+import Test.Hedgehog.Golden.ErrorMessage qualified as ErrorMessage
+import Test.Tasty
 
 test_GovernanceCmdError :: TestTree
 test_GovernanceCmdError =
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Action.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Action.hs
index 5a80d97aa8..7082b2647e 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Action.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Action.hs
@@ -4,24 +4,36 @@
 
 module Test.Golden.Governance.Action where
 
-import           Cardano.Api (MonadIO)
-
-import           Control.Monad (void)
-import           Control.Monad.Catch (MonadCatch)
-import           Control.Monad.Trans.Control (MonadBaseControl)
-
-import           Test.Cardano.CLI.Hash (exampleAnchorDataHash, exampleAnchorDataHash2,
-                   exampleAnchorDataIpfsHash, exampleAnchorDataIpfsHash2,
-                   exampleAnchorDataPathGolden, exampleAnchorDataPathGolden2, serveFilesWhile,
-                   tamperBase16Hash)
-import qualified Test.Cardano.CLI.Util as H
-import           Test.Cardano.CLI.Util (execCardanoCLI, execCardanoCLIWithEnvVars, expectFailure,
-                   noteInputFile, noteTempFile, propertyOnce)
-
-import           Hedgehog (MonadTest, Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Cardano.Api (MonadIO)
+
+import Control.Monad (void)
+import Control.Monad.Catch (MonadCatch)
+import Control.Monad.Trans.Control (MonadBaseControl)
+
+import Test.Cardano.CLI.Hash
+  ( exampleAnchorDataHash
+  , exampleAnchorDataHash2
+  , exampleAnchorDataIpfsHash
+  , exampleAnchorDataIpfsHash2
+  , exampleAnchorDataPathGolden
+  , exampleAnchorDataPathGolden2
+  , serveFilesWhile
+  , tamperBase16Hash
+  )
+import Test.Cardano.CLI.Util
+  ( execCardanoCLI
+  , execCardanoCLIWithEnvVars
+  , expectFailure
+  , noteInputFile
+  , noteTempFile
+  , propertyOnce
+  )
+import Test.Cardano.CLI.Util qualified as H
+
+import Hedgehog (MonadTest, Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 hprop_golden_governance_action_create_constitution_wrong_hash1_fails :: Property
 hprop_golden_governance_action_create_constitution_wrong_hash1_fails =
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs
index fc463dbe0b..a775b8ae72 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs
@@ -4,23 +4,28 @@
 
 module Test.Golden.Governance.Committee where
 
-import           Control.Monad (forM_, void)
-import           Data.Monoid (Last (..))
-import qualified System.Environment as IO
-import           System.Exit (ExitCode (..))
-import           System.FilePath ((</>))
-
-import           Test.Cardano.CLI.Aeson (assertHasMappings)
-import           Test.Cardano.CLI.Hash (exampleAnchorDataHash, exampleAnchorDataIpfsHash,
-                   exampleAnchorDataPathGolden, serveFilesWhile, tamperBase16Hash)
-import qualified Test.Cardano.CLI.Util as H hiding (noteTempFile)
-import           Test.Cardano.CLI.Util
-
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras as H
-import qualified Hedgehog.Extras.Test.Golden as H
-import           Hedgehog.Internal.Property ((===))
+import Control.Monad (forM_, void)
+import Data.Monoid (Last (..))
+import System.Environment qualified as IO
+import System.Exit (ExitCode (..))
+import System.FilePath ((</>))
+
+import Test.Cardano.CLI.Aeson (assertHasMappings)
+import Test.Cardano.CLI.Hash
+  ( exampleAnchorDataHash
+  , exampleAnchorDataIpfsHash
+  , exampleAnchorDataPathGolden
+  , serveFilesWhile
+  , tamperBase16Hash
+  )
+import Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util qualified as H hiding (noteTempFile)
+
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
+import Hedgehog.Internal.Property ((===))
 
 goldenDir, inputDir :: FilePath
 goldenDir = "test/cardano-cli-golden/files/golden"
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/StakeAddress.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/StakeAddress.hs
index e58a897cee..009100b047 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/StakeAddress.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/StakeAddress.hs
@@ -3,17 +3,21 @@
 
 module Test.Golden.Governance.StakeAddress where
 
-import           Control.Monad (void)
-import           System.Exit (ExitCode (..))
-
-import           Test.Cardano.CLI.Hash (serveFilesWhile, tamperBase16Hash)
-import           Test.Cardano.CLI.Util (execCardanoCLI, execDetailCardanoCLI, noteInputFile,
-                   propertyOnce)
-
-import           Hedgehog
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Control.Monad (void)
+import System.Exit (ExitCode (..))
+
+import Test.Cardano.CLI.Hash (serveFilesWhile, tamperBase16Hash)
+import Test.Cardano.CLI.Util
+  ( execCardanoCLI
+  , execDetailCardanoCLI
+  , noteInputFile
+  , propertyOnce
+  )
+
+import Hedgehog
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 exampleStakePoolMetadataHash :: String
 exampleStakePoolMetadataHash = "8241de08075886a7d09c847c9bbd1719459dac0bd0a2f085e673611ebb9a5965"
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Vote.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Vote.hs
index c939c17a5c..f5326ac6f0 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Vote.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Vote.hs
@@ -2,20 +2,29 @@
 
 module Test.Golden.Governance.Vote where
 
-import           Control.Monad (void)
-import           Data.Monoid (Last (..))
-import           GHC.IO.Exception (ExitCode (..))
-import qualified System.Environment as IO
-
-import           Test.Cardano.CLI.Hash (exampleAnchorDataHash, exampleAnchorDataIpfsHash,
-                   exampleAnchorDataPathGolden, serveFilesWhile, tamperBase16Hash)
-import           Test.Cardano.CLI.Util (execCardanoCLI, execDetailConfigCardanoCLI, noteInputFile,
-                   propertyOnce)
-
-import           Hedgehog (Property, (===))
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Control.Monad (void)
+import Data.Monoid (Last (..))
+import GHC.IO.Exception (ExitCode (..))
+import System.Environment qualified as IO
+
+import Test.Cardano.CLI.Hash
+  ( exampleAnchorDataHash
+  , exampleAnchorDataIpfsHash
+  , exampleAnchorDataPathGolden
+  , serveFilesWhile
+  , tamperBase16Hash
+  )
+import Test.Cardano.CLI.Util
+  ( execCardanoCLI
+  , execDetailConfigCardanoCLI
+  , noteInputFile
+  , propertyOnce
+  )
+
+import Hedgehog (Property, (===))
+import Hedgehog qualified as H
+import Hedgehog.Extras qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 hprop_golden_governance_governance_vote_create :: Property
 hprop_golden_governance_governance_vote_create =
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Hash/Hash.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Hash/Hash.hs
index 0ddf86650d..cdc12d31fd 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Hash/Hash.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Hash/Hash.hs
@@ -3,13 +3,13 @@
 {-# HLINT ignore "Use camelCase" #-}
 module Test.Golden.Hash.Hash where
 
-import           Control.Monad
+import Control.Monad
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog.Extras qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 hprop_golden_governance_hash_script :: Property
 hprop_golden_governance_hash_script =
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Help.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Help.hs
index c40ae4b198..6d07d01886 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Help.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Help.hs
@@ -8,24 +8,24 @@ module Test.Golden.Help
   )
 where
 
-import           Prelude hiding (lines)
-
-import           Control.Monad (forM_, unless, (<=<))
-import qualified Data.Char as Char
-import qualified Data.List as List
-import           Data.Maybe (maybeToList)
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import           System.FilePath ((</>))
-import           Text.Regex (Regex, mkRegex, subRegex)
-
-import qualified Test.Cardano.CLI.Util as H
-import           Test.Cardano.CLI.Util (execCardanoCLI, propertyOnce)
-
-import           Hedgehog (Property)
-import           Hedgehog.Extras.Stock.OS (isWin32)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Prelude hiding (lines)
+
+import Control.Monad (forM_, unless, (<=<))
+import Data.Char qualified as Char
+import Data.List qualified as List
+import Data.Maybe (maybeToList)
+import Data.Text (Text)
+import Data.Text qualified as Text
+import System.FilePath ((</>))
+import Text.Regex (Regex, mkRegex, subRegex)
+
+import Test.Cardano.CLI.Util (execCardanoCLI, propertyOnce)
+import Test.Cardano.CLI.Util qualified as H
+
+import Hedgehog (Property)
+import Hedgehog.Extras.Stock.OS (isWin32)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 ansiRegex :: Regex
 ansiRegex = mkRegex "\\[[0-9]+m"
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Key/NonExtendedKey.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Key/NonExtendedKey.hs
index 5599f29bf3..0a5347ea4e 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Key/NonExtendedKey.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Key/NonExtendedKey.hs
@@ -2,16 +2,16 @@
 
 module Test.Golden.Key.NonExtendedKey where
 
-import           Control.Monad (void)
-import           Control.Monad.Extra (forM_)
-import           System.FilePath ((</>))
+import Control.Monad (void)
+import Control.Monad.Extra (forM_)
+import System.FilePath ((</>))
 
-import qualified Test.Cardano.CLI.Util as H
-import           Test.Cardano.CLI.Util (execCardanoCLI, propertyOnce)
+import Test.Cardano.CLI.Util (execCardanoCLI, propertyOnce)
+import Test.Cardano.CLI.Util qualified as H
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Address/Build.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Address/Build.hs
index a3223d578e..12fdfd39df 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Address/Build.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Address/Build.hs
@@ -2,13 +2,13 @@
 
 module Test.Golden.Shelley.Address.Build where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util as OP
+import Test.Cardano.CLI.Util as OP
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Address/Info.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Address/Info.hs
index 993a02113a..26fbf44b6e 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Address/Info.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Address/Info.hs
@@ -2,13 +2,13 @@
 
 module Test.Golden.Shelley.Address.Info where
 
-import           Control.Monad (when)
-import qualified Data.List as L
+import Control.Monad (when)
+import Data.List qualified as L
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Address/KeyGen.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Address/KeyGen.hs
index 8aa7dcaee4..d0a3fb6655 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Address/KeyGen.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Address/KeyGen.hs
@@ -2,14 +2,14 @@
 
 module Test.Golden.Shelley.Address.KeyGen where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Aeson
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Aeson
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/Create.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/Create.hs
index e3f1d6df52..9664ae64dc 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/Create.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/Create.hs
@@ -7,28 +7,28 @@ module Test.Golden.Shelley.Genesis.Create
   )
 where
 
-import           Control.Monad (void)
-import qualified Data.Aeson as J
-import qualified Data.Aeson.Key as J
-import qualified Data.Aeson.Types as J
-import           Data.Bifunctor (Bifunctor (..))
-import qualified Data.ByteString.Lazy as LBS
-import           Data.Foldable (for_)
-import qualified Data.HashMap.Lazy as HM
-import qualified Data.Set as S
-import qualified Data.Time.Clock as DT
-import           GHC.Exts (IsList (..))
-
-import           Test.Cardano.CLI.Aeson (assertHasMappings)
-import           Test.Cardano.CLI.Util as OP
-
-import           Hedgehog (Property, forAll, (===))
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Stock.Time as H
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
-import qualified Hedgehog.Gen as G
-import qualified Hedgehog.Range as R
+import Control.Monad (void)
+import Data.Aeson qualified as J
+import Data.Aeson.Key qualified as J
+import Data.Aeson.Types qualified as J
+import Data.Bifunctor (Bifunctor (..))
+import Data.ByteString.Lazy qualified as LBS
+import Data.Foldable (for_)
+import Data.HashMap.Lazy qualified as HM
+import Data.Set qualified as S
+import Data.Time.Clock qualified as DT
+import GHC.Exts (IsList (..))
+
+import Test.Cardano.CLI.Aeson (assertHasMappings)
+import Test.Cardano.CLI.Util as OP
+
+import Hedgehog (Property, forAll, (===))
+import Hedgehog qualified as H
+import Hedgehog.Extras.Stock.Time qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
+import Hedgehog.Gen qualified as G
+import Hedgehog.Range qualified as R
 
 {- HLINT ignore "Use <$>" -}
 {- HLINT ignore "Use camelCase" -}
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/InitialTxIn.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/InitialTxIn.hs
index 29b5d61c7c..4b2f162cbe 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/InitialTxIn.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/InitialTxIn.hs
@@ -2,11 +2,11 @@
 
 module Test.Golden.Shelley.Genesis.InitialTxIn where
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog.Extras qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyGenDelegate.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyGenDelegate.hs
index 17429d5f21..be63954761 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyGenDelegate.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyGenDelegate.hs
@@ -2,14 +2,14 @@
 
 module Test.Golden.Shelley.Genesis.KeyGenDelegate where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Aeson
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Aeson
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyGenGenesis.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyGenGenesis.hs
index 4e345a276d..62644d7e6f 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyGenGenesis.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyGenGenesis.hs
@@ -2,14 +2,14 @@
 
 module Test.Golden.Shelley.Genesis.KeyGenGenesis where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Aeson
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Aeson
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyGenUtxo.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyGenUtxo.hs
index 647293a95d..c3ea467399 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyGenUtxo.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyGenUtxo.hs
@@ -2,14 +2,14 @@
 
 module Test.Golden.Shelley.Genesis.KeyGenUtxo where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Aeson
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Aeson
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyHash.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyHash.hs
index 46a639d980..452a28183f 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyHash.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Genesis/KeyHash.hs
@@ -2,11 +2,11 @@
 
 module Test.Golden.Shelley.Genesis.KeyHash where
 
-import           Test.Cardano.CLI.Util as OP
+import Test.Cardano.CLI.Util as OP
 
-import           Hedgehog (Property, (===))
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property, (===))
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Key/ConvertCardanoAddressKey.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Key/ConvertCardanoAddressKey.hs
index 6b3c3a495f..23070aee0d 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Key/ConvertCardanoAddressKey.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Key/ConvertCardanoAddressKey.hs
@@ -2,19 +2,19 @@
 
 module Test.Golden.Shelley.Key.ConvertCardanoAddressKey where
 
-import           Control.Monad (void)
-import           Control.Monad.Extra (forM_)
-import           Data.Text (Text)
-import           System.FilePath.Posix ((</>))
-
-import qualified Test.Cardano.CLI.Aeson as Aeson
-import qualified Test.Cardano.CLI.Util as H
-import           Test.Cardano.CLI.Util
-
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H hiding (noteTempFile)
-import qualified Hedgehog.Extras.Test.File as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Control.Monad (void)
+import Control.Monad.Extra (forM_)
+import Data.Text (Text)
+import System.FilePath.Posix ((</>))
+
+import Test.Cardano.CLI.Aeson qualified as Aeson
+import Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util qualified as H
+
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H hiding (noteTempFile)
+import Hedgehog.Extras.Test.File qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Metadata/StakePoolMetadata.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Metadata/StakePoolMetadata.hs
index 6c5eb4846e..12e33b464f 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Metadata/StakePoolMetadata.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Metadata/StakePoolMetadata.hs
@@ -2,16 +2,16 @@
 
 module Test.Golden.Shelley.Metadata.StakePoolMetadata where
 
-import           Control.Monad (void)
-import           Data.Text (Text)
-import qualified Data.Text.IO as Text
+import Control.Monad (void)
+import Data.Text (Text)
+import Data.Text.IO qualified as Text
 
-import           Test.Cardano.CLI.Util as OP
+import Test.Cardano.CLI.Util as OP
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/MultiSig/Address.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/MultiSig/Address.hs
index e9b8719249..fa201205a6 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/MultiSig/Address.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/MultiSig/Address.hs
@@ -2,12 +2,12 @@
 
 module Test.Golden.Shelley.MultiSig.Address where
 
-import           Test.Cardano.CLI.Util as OP
+import Test.Cardano.CLI.Util as OP
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/IssueOpCert.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/IssueOpCert.hs
index e8cbb3f625..433dca2577 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/IssueOpCert.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/IssueOpCert.hs
@@ -2,14 +2,14 @@
 
 module Test.Golden.Shelley.Node.IssueOpCert where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Aeson (assertHasMappings)
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Aeson (assertHasMappings)
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/KeyGen.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/KeyGen.hs
index 75c2d6733a..de3b5e1658 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/KeyGen.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/KeyGen.hs
@@ -2,14 +2,14 @@
 
 module Test.Golden.Shelley.Node.KeyGen where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Aeson
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Aeson
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/KeyGenKes.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/KeyGenKes.hs
index e6ce286766..28e0bb7bd9 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/KeyGenKes.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/KeyGenKes.hs
@@ -2,14 +2,14 @@
 
 module Test.Golden.Shelley.Node.KeyGenKes where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Aeson
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Aeson
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/KeyGenVrf.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/KeyGenVrf.hs
index 3347f4de48..ec704e5cc9 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/KeyGenVrf.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Node/KeyGenVrf.hs
@@ -2,14 +2,14 @@
 
 module Test.Golden.Shelley.Node.KeyGenVrf where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Aeson
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Aeson
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/Build.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/Build.hs
index 5a16e930a2..4b8ab2a5cd 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/Build.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/Build.hs
@@ -2,11 +2,11 @@
 
 module Test.Golden.Shelley.StakeAddress.Build where
 
-import           Test.Cardano.CLI.Util as OP
+import Test.Cardano.CLI.Util as OP
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/DeregistrationCertificate.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/DeregistrationCertificate.hs
index 82b6af131e..971ea688f3 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/DeregistrationCertificate.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/DeregistrationCertificate.hs
@@ -2,15 +2,15 @@
 
 module Test.Golden.Shelley.StakeAddress.DeregistrationCertificate where
 
-import           Control.Monad (void)
-import           System.FilePath ((</>))
+import Control.Monad (void)
+import System.FilePath ((</>))
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.Golden as H
-import qualified Hedgehog.Extras.Test.Process as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
+import Hedgehog.Extras.Test.Process qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/KeyGen.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/KeyGen.hs
index c72a53679b..c444994b79 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/KeyGen.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/KeyGen.hs
@@ -2,13 +2,13 @@
 
 module Test.Golden.Shelley.StakeAddress.KeyGen where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/KeyHash.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/KeyHash.hs
index e275393382..7887ac0ccd 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/KeyHash.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/KeyHash.hs
@@ -2,11 +2,11 @@
 
 module Test.Golden.Shelley.StakeAddress.KeyHash where
 
-import           Test.Cardano.CLI.Util as OP
+import Test.Cardano.CLI.Util as OP
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/RegistrationCertificate.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/RegistrationCertificate.hs
index d0a36ac9f1..482e698213 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/RegistrationCertificate.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakeAddress/RegistrationCertificate.hs
@@ -2,15 +2,15 @@
 
 module Test.Golden.Shelley.StakeAddress.RegistrationCertificate where
 
-import           Control.Monad (void)
-import           System.FilePath ((</>))
+import Control.Monad (void)
+import System.FilePath ((</>))
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.Golden as H
-import qualified Hedgehog.Extras.Test.Process as H
+import Hedgehog
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
+import Hedgehog.Extras.Test.Process qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakePool/RegistrationCertificate.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakePool/RegistrationCertificate.hs
index 2ead8ac499..96636aed74 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakePool/RegistrationCertificate.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/StakePool/RegistrationCertificate.hs
@@ -2,13 +2,13 @@
 
 module Test.Golden.Shelley.StakePool.RegistrationCertificate where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/GenesisKeyDelegation.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/GenesisKeyDelegation.hs
index d41d5a7981..2a512facb6 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/GenesisKeyDelegation.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/GenesisKeyDelegation.hs
@@ -2,16 +2,20 @@
 
 module Test.Golden.Shelley.TextEnvelope.Certificates.GenesisKeyDelegation where
 
-import           Cardano.Api (AsType (..), CardanoEra (..), cardanoEraConstraints,
-                   textEnvelopeTypeInEra)
+import Cardano.Api
+  ( AsType (..)
+  , CardanoEra (..)
+  , cardanoEraConstraints
+  , textEnvelopeTypeInEra
+  )
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/MIR.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/MIR.hs
index 5730cb0528..072116b364 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/MIR.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/MIR.hs
@@ -2,15 +2,15 @@
 
 module Test.Golden.Shelley.TextEnvelope.Certificates.MIR where
 
-import           Cardano.Api (AsType (..), CardanoEra (..), textEnvelopeTypeInEra)
+import Cardano.Api (AsType (..), CardanoEra (..), textEnvelopeTypeInEra)
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/Operational.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/Operational.hs
index ee962f9310..9f69e873ec 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/Operational.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/Operational.hs
@@ -2,15 +2,15 @@
 
 module Test.Golden.Shelley.TextEnvelope.Certificates.Operational where
 
-import           Cardano.Api (AsType (..), HasTextEnvelope (..))
+import Cardano.Api (AsType (..), HasTextEnvelope (..))
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/StakeAddress.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/StakeAddress.hs
index 204c6fe9b3..574f07a8d2 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/StakeAddress.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/StakeAddress.hs
@@ -2,16 +2,16 @@
 
 module Test.Golden.Shelley.TextEnvelope.Certificates.StakeAddress where
 
-import           Cardano.Api
+import Cardano.Api
 
-import           Control.Monad (void)
-import           Data.Char (toLower)
+import Control.Monad (void)
+import Data.Char (toLower)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/StakePool.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/StakePool.hs
index 3a1db87bb7..568d967233 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/StakePool.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Certificates/StakePool.hs
@@ -2,16 +2,20 @@
 
 module Test.Golden.Shelley.TextEnvelope.Certificates.StakePool where
 
-import           Cardano.Api (AsType (..), CardanoEra (..), cardanoEraConstraints,
-                   textEnvelopeTypeInEra)
+import Cardano.Api
+  ( AsType (..)
+  , CardanoEra (..)
+  , cardanoEraConstraints
+  , textEnvelopeTypeInEra
+  )
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/ExtendedPaymentKeys.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/ExtendedPaymentKeys.hs
index 2726984e41..2dcc61074c 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/ExtendedPaymentKeys.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/ExtendedPaymentKeys.hs
@@ -3,17 +3,17 @@
 
 module Test.Golden.Shelley.TextEnvelope.Keys.ExtendedPaymentKeys where
 
-import           Cardano.Api (AsType (..), HasTextEnvelope (..))
+import Cardano.Api (AsType (..), HasTextEnvelope (..))
 
-import           Control.Monad (void)
-import           Text.Regex.TDFA ((=~))
+import Control.Monad (void)
+import Text.Regex.TDFA ((=~))
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/GenesisDelegateKeys.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/GenesisDelegateKeys.hs
index 1b28ca5637..b394732c32 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/GenesisDelegateKeys.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/GenesisDelegateKeys.hs
@@ -2,14 +2,14 @@
 
 module Test.Golden.Shelley.TextEnvelope.Keys.GenesisDelegateKeys where
 
-import           Cardano.Api (AsType (..), HasTextEnvelope (..))
+import Cardano.Api (AsType (..), HasTextEnvelope (..))
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/GenesisKeys.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/GenesisKeys.hs
index 8427026e91..01e98d39d0 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/GenesisKeys.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/GenesisKeys.hs
@@ -2,14 +2,14 @@
 
 module Test.Golden.Shelley.TextEnvelope.Keys.GenesisKeys where
 
-import           Cardano.Api (AsType (..), HasTextEnvelope (..))
+import Cardano.Api (AsType (..), HasTextEnvelope (..))
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/GenesisUTxOKeys.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/GenesisUTxOKeys.hs
index 21c8e74e3f..8475d158ca 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/GenesisUTxOKeys.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/GenesisUTxOKeys.hs
@@ -2,14 +2,14 @@
 
 module Test.Golden.Shelley.TextEnvelope.Keys.GenesisUTxOKeys where
 
-import           Cardano.Api (AsType (..), HasTextEnvelope (..))
+import Cardano.Api (AsType (..), HasTextEnvelope (..))
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/KESKeys.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/KESKeys.hs
index cb09756794..875c85815d 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/KESKeys.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/KESKeys.hs
@@ -3,17 +3,17 @@
 
 module Test.Golden.Shelley.TextEnvelope.Keys.KESKeys where
 
-import           Cardano.Api (AsType (..), HasTextEnvelope (..))
+import Cardano.Api (AsType (..), HasTextEnvelope (..))
 
-import           Control.Monad (void)
-import           Text.Regex.TDFA ((=~))
+import Control.Monad (void)
+import Text.Regex.TDFA ((=~))
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/PaymentKeys.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/PaymentKeys.hs
index d91b9536ef..8528f3d7b8 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/PaymentKeys.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/PaymentKeys.hs
@@ -3,17 +3,17 @@
 
 module Test.Golden.Shelley.TextEnvelope.Keys.PaymentKeys where
 
-import           Cardano.Api (AsType (..), HasTextEnvelope (..))
+import Cardano.Api (AsType (..), HasTextEnvelope (..))
 
-import           Control.Monad (void)
-import           Text.Regex.TDFA ((=~))
+import Control.Monad (void)
+import Text.Regex.TDFA ((=~))
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/StakeKeys.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/StakeKeys.hs
index 8865a2d9b2..2456cff3b8 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/StakeKeys.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/StakeKeys.hs
@@ -3,17 +3,17 @@
 
 module Test.Golden.Shelley.TextEnvelope.Keys.StakeKeys where
 
-import           Cardano.Api (AsType (..), HasTextEnvelope (..))
+import Cardano.Api (AsType (..), HasTextEnvelope (..))
 
-import           Control.Monad (void)
-import           Text.Regex.TDFA ((=~))
+import Control.Monad (void)
+import Text.Regex.TDFA ((=~))
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/VRFKeys.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/VRFKeys.hs
index 5f30c173b0..ddf9ab46a9 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/VRFKeys.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Keys/VRFKeys.hs
@@ -3,17 +3,17 @@
 
 module Test.Golden.Shelley.TextEnvelope.Keys.VRFKeys where
 
-import           Cardano.Api (AsType (..), HasTextEnvelope (..))
+import Cardano.Api (AsType (..), HasTextEnvelope (..))
 
-import           Control.Monad (void)
-import           Text.Regex.TDFA ((=~))
+import Control.Monad (void)
+import Text.Regex.TDFA ((=~))
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Tx/Tx.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Tx/Tx.hs
index d64fa9f357..b00f334f9f 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Tx/Tx.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Tx/Tx.hs
@@ -2,12 +2,12 @@
 
 module Test.Golden.Shelley.TextEnvelope.Tx.Tx where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Tx/TxBody.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Tx/TxBody.hs
index c5a59aa5c7..d5ff974bc6 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Tx/TxBody.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Tx/TxBody.hs
@@ -2,12 +2,12 @@
 
 module Test.Golden.Shelley.TextEnvelope.Tx.TxBody where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Tx/Witness.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Tx/Witness.hs
index d38658aa30..1a9b07411a 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Tx/Witness.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextEnvelope/Tx/Witness.hs
@@ -1,6 +1,6 @@
 module Test.Golden.Shelley.TextEnvelope.Tx.Witness where
 
-import           Hedgehog (Property, property, success)
+import Hedgehog (Property, property, success)
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextView/DecodeCbor.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextView/DecodeCbor.hs
index d743f19f93..636226cd54 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextView/DecodeCbor.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/TextView/DecodeCbor.hs
@@ -2,11 +2,11 @@
 
 module Test.Golden.Shelley.TextView.DecodeCbor where
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Assemble.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Assemble.hs
index 29556aa66c..38253749c6 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Assemble.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Assemble.hs
@@ -2,13 +2,13 @@
 
 module Test.Golden.Shelley.Transaction.Assemble where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Build.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Build.hs
index f6b3e9343f..71b5def302 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Build.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Build.hs
@@ -2,16 +2,16 @@
 
 module Test.Golden.Shelley.Transaction.Build where
 
-import           Control.Monad (void)
-import qualified Data.ByteString.Base16 as Base16
-import qualified Data.ByteString.Char8 as BSC
+import Control.Monad (void)
+import Data.ByteString.Base16 qualified as Base16
+import Data.ByteString.Char8 qualified as BSC
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/CalculateMinFee.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/CalculateMinFee.hs
index e3512046bd..4c362e4c01 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/CalculateMinFee.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/CalculateMinFee.hs
@@ -3,18 +3,18 @@
 
 module Test.Golden.Shelley.Transaction.CalculateMinFee where
 
-import           Control.Monad (forM_)
-import           Data.Aeson ((.=))
-import qualified Data.Aeson as Aeson
-import qualified Data.Text.Lazy as TL
-import qualified Data.Text.Lazy.Encoding as TL
-import           System.FilePath ((</>))
+import Control.Monad (forM_)
+import Data.Aeson ((.=))
+import Data.Aeson qualified as Aeson
+import Data.Text.Lazy qualified as TL
+import Data.Text.Lazy.Encoding qualified as TL
+import System.FilePath ((</>))
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/CreateWitness.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/CreateWitness.hs
index fe319de342..a48046d2d5 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/CreateWitness.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/CreateWitness.hs
@@ -2,13 +2,13 @@
 
 module Test.Golden.Shelley.Transaction.CreateWitness where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Id.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Id.hs
index 7de4d39ad5..51fdd44465 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Id.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Id.hs
@@ -2,11 +2,11 @@
 
 module Test.Golden.Shelley.Transaction.Id where
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Sign.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Sign.hs
index f7cc64e6bf..8e3523a4ed 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Sign.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/Sign.hs
@@ -2,13 +2,13 @@
 
 module Test.Golden.Shelley.Transaction.Sign where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.Golden qualified as H
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/TxView.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/TxView.hs
index acb0f3b02d..b03fe85ba9 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/TxView.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/TxView.hs
@@ -2,16 +2,16 @@
 
 module Test.Golden.TxView where
 
-import           Cardano.Api (TxMetadataJsonSchema (..))
+import Cardano.Api (TxMetadataJsonSchema (..))
 
-import           Control.Monad (void)
-import           System.FilePath ((</>))
+import Control.Monad (void)
+import System.FilePath ((</>))
 
-import           Test.Cardano.CLI.Util (execCardanoCLI, noteTempFile)
+import Test.Cardano.CLI.Util (execCardanoCLI, noteTempFile)
 
-import           Hedgehog (Property)
-import           Hedgehog.Extras (Integration, moduleWorkspace, note_, propertyOnce)
-import qualified Hedgehog.Extras.Test.Golden as H
+import Hedgehog (Property)
+import Hedgehog.Extras (Integration, moduleWorkspace, note_, propertyOnce)
+import Hedgehog.Extras.Test.Golden qualified as H
 
 goldenDir, inputDir :: FilePath
 goldenDir = "test/cardano-cli-golden/files/golden"
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Version.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Version.hs
index 8fe120f815..785099e96c 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Version.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Version.hs
@@ -5,11 +5,11 @@ module Test.Golden.Version
   )
 where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
+import Hedgehog (Property)
 
 {- HLINT ignore "Use camelCase" -}
 
diff --git a/cardano-cli/test/cardano-cli-test-lib/Test/Cardano/CLI/Aeson.hs b/cardano-cli/test/cardano-cli-test-lib/Test/Cardano/CLI/Aeson.hs
index 45cd5e66d3..964df84fea 100644
--- a/cardano-cli/test/cardano-cli-test-lib/Test/Cardano/CLI/Aeson.hs
+++ b/cardano-cli/test/cardano-cli-test-lib/Test/Cardano/CLI/Aeson.hs
@@ -8,24 +8,24 @@ module Test.Cardano.CLI.Aeson
   )
 where
 
-import           Control.Monad (forM_)
-import           Control.Monad.IO.Class
-import           Data.Aeson hiding (pairs)
-import           Data.Aeson.Encode.Pretty (encodePretty)
-import           Data.Aeson.Key
-import qualified Data.Aeson.Key as Aeson
-import qualified Data.Aeson.KeyMap as Aeson.KeyMap
-import qualified Data.ByteString.Lazy as LBS
-import qualified Data.Map as Map
-import           Data.Text (Text)
-import qualified Data.Text as T
-import qualified Data.Vector as Vector
-import           GHC.Stack (HasCallStack)
-import qualified GHC.Stack as GHC
+import Control.Monad (forM_)
+import Control.Monad.IO.Class
+import Data.Aeson hiding (pairs)
+import Data.Aeson.Encode.Pretty (encodePretty)
+import Data.Aeson.Key
+import Data.Aeson.Key qualified as Aeson
+import Data.Aeson.KeyMap qualified as Aeson.KeyMap
+import Data.ByteString.Lazy qualified as LBS
+import Data.Map qualified as Map
+import Data.Text (Text)
+import Data.Text qualified as T
+import Data.Vector qualified as Vector
+import GHC.Stack (HasCallStack)
+import GHC.Stack qualified as GHC
 
-import           Hedgehog
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras as H
+import Hedgehog
+import Hedgehog qualified as H
+import Hedgehog.Extras qualified as H
 
 {- HLINT ignore "Use uncurry" -}
 
diff --git a/cardano-cli/test/cardano-cli-test-lib/Test/Cardano/CLI/Hash.hs b/cardano-cli/test/cardano-cli-test-lib/Test/Cardano/CLI/Hash.hs
index e42a2ae89d..9cdc62e453 100644
--- a/cardano-cli/test/cardano-cli-test-lib/Test/Cardano/CLI/Hash.hs
+++ b/cardano-cli/test/cardano-cli-test-lib/Test/Cardano/CLI/Hash.hs
@@ -14,28 +14,34 @@ module Test.Cardano.CLI.Hash
   )
 where
 
-import           Cardano.Api (MonadIO)
+import Cardano.Api (MonadIO)
 
-import           Control.Concurrent (forkOS)
-import           Control.Exception.Lifted (bracket)
-import           Control.Monad (void)
-import           Control.Monad.Trans.Control (MonadBaseControl)
-import qualified Data.ByteString.UTF8 as BSU8
-import           Data.Char (toLower)
-import           Data.Foldable (find)
-import           Data.List (elemIndex, intercalate)
-import           Data.String (IsString (fromString))
-import           Data.Text (unpack)
-import qualified Data.Text as T
-import           Network.HTTP.Types.Status (status200, status404)
-import           Network.HTTP.Types.URI (renderQuery)
-import           Network.Socket (close)
-import           Network.Wai (Request (..), Response, ResponseReceived, pathInfo, responseFile,
-                   responseLBS)
-import           Network.Wai.Handler.Warp (defaultSettings, openFreePort, runSettingsSocket)
+import Control.Concurrent (forkOS)
+import Control.Exception.Lifted (bracket)
+import Control.Monad (void)
+import Control.Monad.Trans.Control (MonadBaseControl)
+import Data.ByteString.UTF8 qualified as BSU8
+import Data.Char (toLower)
+import Data.Foldable (find)
+import Data.List (elemIndex, intercalate)
+import Data.String (IsString (fromString))
+import Data.Text (unpack)
+import Data.Text qualified as T
+import Network.HTTP.Types.Status (status200, status404)
+import Network.HTTP.Types.URI (renderQuery)
+import Network.Socket (close)
+import Network.Wai
+  ( Request (..)
+  , Response
+  , ResponseReceived
+  , pathInfo
+  , responseFile
+  , responseLBS
+  )
+import Network.Wai.Handler.Warp (defaultSettings, openFreePort, runSettingsSocket)
 
-import           Hedgehog as H
-import           Hedgehog.Internal.Source (HasCallStack)
+import Hedgehog as H
+import Hedgehog.Internal.Source (HasCallStack)
 
 exampleAnchorDataHash, exampleAnchorDataHash2 :: String
 exampleAnchorDataHash = "de38a4f5b8b9d8372386cc923bad19d1a0662298cf355bbe947e5eedf127fa9c"
diff --git a/cardano-cli/test/cardano-cli-test-lib/Test/Cardano/CLI/Util.hs b/cardano-cli/test/cardano-cli-test-lib/Test/Cardano/CLI/Util.hs
index 977943eded..656a36b040 100644
--- a/cardano-cli/test/cardano-cli-test-lib/Test/Cardano/CLI/Util.hs
+++ b/cardano-cli/test/cardano-cli-test-lib/Test/Cardano/CLI/Util.hs
@@ -3,7 +3,6 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE StandaloneDeriving #-}
 
 module Test.Cardano.CLI.Util
   ( assertDirectoryMissing
@@ -24,42 +23,42 @@ module Test.Cardano.CLI.Util
   )
 where
 
-import           Cardano.Api
-
-import           Cardano.CLI.Read
-
-import           Control.Monad (when)
-import           Control.Monad.Catch hiding (bracket_)
-import           Control.Monad.Morph (hoist)
-import           Control.Monad.Trans.Resource (ResourceT, runResourceT)
-import qualified Data.Aeson as Aeson
-import qualified Data.Aeson.Encode.Pretty as Aeson
-import qualified Data.Aeson.Key as Aeson
-import qualified Data.Aeson.KeyMap as Aeson
-import qualified Data.ByteString.Lazy as LBS
-import           Data.Function ((&))
-import qualified Data.List as List
-import           Data.Monoid (Last (..))
-import           Data.Text (Text)
-import           GHC.IO.Exception (ExitCode (..))
-import           GHC.Stack (CallStack, HasCallStack)
-import qualified GHC.Stack as GHC
-import qualified System.Directory as IO
-import qualified System.Environment as IO
-import qualified System.Exit as IO
-import           System.FilePath (takeDirectory)
-import qualified System.IO.Unsafe as IO
-import qualified System.Process as IO
-import           System.Process (CreateProcess)
-
-import qualified Hedgehog as H
-import           Hedgehog.Extras (ExecConfig)
-import qualified Hedgehog.Extras as H
-import           Hedgehog.Extras.Test (ExecConfig (..))
-import           Hedgehog.Internal.Property (Diff, MonadTest, liftTest, mkTest)
-import qualified Hedgehog.Internal.Property as H
-import           Hedgehog.Internal.Show (ValueDiff (ValueSame), mkValue, showPretty, valueDiff)
-import           Hedgehog.Internal.Source (getCaller)
+import Cardano.Api
+
+import Cardano.CLI.Read
+
+import Control.Monad (when)
+import Control.Monad.Catch hiding (bracket_)
+import Control.Monad.Morph (hoist)
+import Control.Monad.Trans.Resource (ResourceT, runResourceT)
+import Data.Aeson qualified as Aeson
+import Data.Aeson.Encode.Pretty qualified as Aeson
+import Data.Aeson.Key qualified as Aeson
+import Data.Aeson.KeyMap qualified as Aeson
+import Data.ByteString.Lazy qualified as LBS
+import Data.Function ((&))
+import Data.List qualified as List
+import Data.Monoid (Last (..))
+import Data.Text (Text)
+import GHC.IO.Exception (ExitCode (..))
+import GHC.Stack (CallStack, HasCallStack)
+import GHC.Stack qualified as GHC
+import System.Directory qualified as IO
+import System.Environment qualified as IO
+import System.Exit qualified as IO
+import System.FilePath (takeDirectory)
+import System.IO.Unsafe qualified as IO
+import System.Process (CreateProcess)
+import System.Process qualified as IO
+
+import Hedgehog qualified as H
+import Hedgehog.Extras (ExecConfig)
+import Hedgehog.Extras qualified as H
+import Hedgehog.Extras.Test (ExecConfig (..))
+import Hedgehog.Internal.Property (Diff, MonadTest, liftTest, mkTest)
+import Hedgehog.Internal.Property qualified as H
+import Hedgehog.Internal.Show (ValueDiff (ValueSame), mkValue, showPretty, valueDiff)
+import Hedgehog.Internal.Source (getCaller)
 
 -- | Execute cardano-cli via the command line.
 --
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/AddCostModels.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/AddCostModels.hs
index f017a47dfc..074c446a03 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/AddCostModels.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/AddCostModels.hs
@@ -2,17 +2,17 @@
 
 module Test.Cli.AddCostModels where
 
-import           Cardano.Api
-import           Cardano.Api.Internal.ProtocolParameters
-import           Cardano.Api.Ledger (StrictMaybe (..))
-import qualified Cardano.Api.Ledger as L
+import Cardano.Api
+import Cardano.Api.Internal.ProtocolParameters
+import Cardano.Api.Ledger (StrictMaybe (..))
+import Cardano.Api.Ledger qualified as L
 
-import           Cardano.CLI.EraBased.Run.Governance.Actions
+import Cardano.CLI.EraBased.Run.Governance.Actions
 
-import           Test.Gen.Cardano.Api.ProtocolParameters
-import           Test.Gen.Cardano.Api.Typed
+import Test.Gen.Cardano.Api.ProtocolParameters
+import Test.Gen.Cardano.Api.Typed
 
-import           Hedgehog
+import Hedgehog
 
 hprop_roundtrip_Alonzo_addCostModelsToEraBasedProtocolParametersUpdate :: Property
 hprop_roundtrip_Alonzo_addCostModelsToEraBasedProtocolParametersUpdate =
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/CheckNodeConfiguration.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/CheckNodeConfiguration.hs
index 447703bce3..a2a820cfab 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/CheckNodeConfiguration.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/CheckNodeConfiguration.hs
@@ -3,26 +3,26 @@
 
 module Test.Cli.CheckNodeConfiguration where
 
-import           Cardano.Api
-
-import           Control.Monad (forM_)
-import qualified Data.Aeson as Aeson
-import qualified Data.Aeson.Encode.Pretty as Aeson
-import qualified Data.Aeson.Key as Aeson
-import qualified Data.Aeson.KeyMap as Aeson
-import qualified Data.ByteString.Lazy as LBS
-import           Data.List (isInfixOf)
-import qualified Data.Text as Text
-import qualified Data.Yaml as Yaml
-import           GHC.IO.Exception (ExitCode (..))
-import           System.FilePath ((</>))
-
-import           Test.Cardano.CLI.Util (execCardanoCLI, execDetailCardanoCLI)
-
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import           Hedgehog.Extras (propertyOnce)
-import qualified Hedgehog.Extras as H
+import Cardano.Api
+
+import Control.Monad (forM_)
+import Data.Aeson qualified as Aeson
+import Data.Aeson.Encode.Pretty qualified as Aeson
+import Data.Aeson.Key qualified as Aeson
+import Data.Aeson.KeyMap qualified as Aeson
+import Data.ByteString.Lazy qualified as LBS
+import Data.List (isInfixOf)
+import Data.Text qualified as Text
+import Data.Yaml qualified as Yaml
+import GHC.IO.Exception (ExitCode (..))
+import System.FilePath ((</>))
+
+import Test.Cardano.CLI.Util (execCardanoCLI, execDetailCardanoCLI)
+
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras (propertyOnce)
+import Hedgehog.Extras qualified as H
 
 nodeConfigFile :: FilePath
 nodeConfigFile = "test/cardano-cli-test/files/input/check-node-configuration/node-config.json"
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/CreateCardano.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/CreateCardano.hs
index ef5596f193..1ad07f4e5f 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/CreateCardano.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/CreateCardano.hs
@@ -2,14 +2,14 @@
 
 module Test.Cli.CreateCardano where
 
-import           Control.Monad (void)
-import           System.FilePath ((</>))
+import Control.Monad (void)
+import System.FilePath ((</>))
 
-import           Test.Cardano.CLI.Util (execCardanoCLI)
+import Test.Cardano.CLI.Util (execCardanoCLI)
 
-import           Hedgehog (Property)
-import           Hedgehog.Extras (moduleWorkspace, propertyOnce)
-import qualified Hedgehog.Extras as H
+import Hedgehog (Property)
+import Hedgehog.Extras (moduleWorkspace, propertyOnce)
+import Hedgehog.Extras qualified as H
 
 -- Execute this test with:
 -- @cabal test cardano-cli-test --test-options '-p "/create cardano/'@
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/CreateTestnetData.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/CreateTestnetData.hs
index b7cc44f4a9..9fbc922b06 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/CreateTestnetData.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/CreateTestnetData.hs
@@ -6,22 +6,25 @@
 
 module Test.Cli.CreateTestnetData where
 
-import           Control.Monad (forM_, void)
-import           Data.Aeson (FromJSON, ToJSON)
-import           Data.List (isInfixOf)
-import           Data.Map.Strict (Map)
-import qualified Data.Map.Strict as M
-import           Data.Text (Text)
-import           GHC.Generics (Generic)
-import           GHC.IO.Exception (ExitCode (..))
-import           System.FilePath ((</>))
-
-import           Test.Cardano.CLI.Util (assertDirectoryMissing, execCardanoCLI,
-                   execDetailCardanoCLI)
-
-import           Hedgehog (Property, success, (===))
-import           Hedgehog.Extras (moduleWorkspace, propertyOnce)
-import qualified Hedgehog.Extras as H
+import Control.Monad (forM_, void)
+import Data.Aeson (FromJSON, ToJSON)
+import Data.List (isInfixOf)
+import Data.Map.Strict (Map)
+import Data.Map.Strict qualified as M
+import Data.Text (Text)
+import GHC.Generics (Generic)
+import GHC.IO.Exception (ExitCode (..))
+import System.FilePath ((</>))
+
+import Test.Cardano.CLI.Util
+  ( assertDirectoryMissing
+  , execCardanoCLI
+  , execDetailCardanoCLI
+  )
+
+import Hedgehog (Property, success, (===))
+import Hedgehog.Extras (moduleWorkspace, propertyOnce)
+import Hedgehog.Extras qualified as H
 
 -- | Test case for https://github.com/IntersectMBO/cardano-cli/issues/587
 -- Execute this test with:
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/DRepMetadata.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/DRepMetadata.hs
index 99655ab383..57f8047b45 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/DRepMetadata.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/DRepMetadata.hs
@@ -2,19 +2,24 @@
 
 module Test.Cli.DRepMetadata where
 
-import           Cardano.Api (MonadIO)
+import Cardano.Api (MonadIO)
 
-import           Control.Monad (void)
-import           Control.Monad.Catch (MonadCatch)
-import           Control.Monad.Trans.Control (MonadBaseControl)
+import Control.Monad (void)
+import Control.Monad.Catch (MonadCatch)
+import Control.Monad.Trans.Control (MonadBaseControl)
 
-import           Test.Cardano.CLI.Hash (exampleAnchorDataHash, exampleAnchorDataIpfsHash,
-                   exampleAnchorDataPathTest, serveFilesWhile, tamperBase16Hash)
-import           Test.Cardano.CLI.Util (execCardanoCLIWithEnvVars, expectFailure, propertyOnce)
+import Test.Cardano.CLI.Hash
+  ( exampleAnchorDataHash
+  , exampleAnchorDataIpfsHash
+  , exampleAnchorDataPathTest
+  , serveFilesWhile
+  , tamperBase16Hash
+  )
+import Test.Cardano.CLI.Util (execCardanoCLIWithEnvVars, expectFailure, propertyOnce)
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import           Hedgehog.Internal.Property (MonadTest)
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Internal.Property (MonadTest)
 
 -- Execute me with:
 -- @cabal test cardano-cli-test --test-options '-p "/drep metadata hash url wrong hash fails/"'@
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/FilePermissions.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/FilePermissions.hs
index 6f4de840e2..01c18fe022 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/FilePermissions.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/FilePermissions.hs
@@ -5,16 +5,16 @@ module Test.Cli.FilePermissions
   )
 where
 
-import           Cardano.Api
-import           Cardano.Api.Internal.IO (checkVrfFilePermissions)
+import Cardano.Api
+import Cardano.Api.Internal.IO (checkVrfFilePermissions)
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util (execCardanoCLI)
+import Test.Cardano.CLI.Util (execCardanoCLI)
 
-import           Hedgehog (Property, success)
-import qualified Hedgehog.Extras.Test.Base as H
-import           Hedgehog.Internal.Property (failWith)
+import Hedgehog (Property, success)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Internal.Property (failWith)
 
 -- | This property ensures that the VRF signing key file is created only with owner permissions
 hprop_createVRFSigningKeyFilePermissions :: Property
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/Committee.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/Committee.hs
index ad32847d6f..cccdb22a4a 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/Committee.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/Committee.hs
@@ -2,20 +2,30 @@
 
 module Test.Cli.Governance.Committee where
 
-import           Cardano.Api (MonadIO)
+import Cardano.Api (MonadIO)
 
-import           Control.Monad (void)
-import           Control.Monad.Catch (MonadCatch)
-import           Control.Monad.Trans.Control (MonadBaseControl)
+import Control.Monad (void)
+import Control.Monad.Catch (MonadCatch)
+import Control.Monad.Trans.Control (MonadBaseControl)
 
-import           Test.Cardano.CLI.Hash (exampleAnchorDataHash, exampleAnchorDataIpfsHash,
-                   exampleAnchorDataPathTest, serveFilesWhile, tamperBase16Hash)
-import           Test.Cardano.CLI.Util (execCardanoCLI, execCardanoCLIWithEnvVars, expectFailure,
-                   noteTempFile, propertyOnce)
+import Test.Cardano.CLI.Hash
+  ( exampleAnchorDataHash
+  , exampleAnchorDataIpfsHash
+  , exampleAnchorDataPathTest
+  , serveFilesWhile
+  , tamperBase16Hash
+  )
+import Test.Cardano.CLI.Util
+  ( execCardanoCLI
+  , execCardanoCLIWithEnvVars
+  , expectFailure
+  , noteTempFile
+  , propertyOnce
+  )
 
-import           Hedgehog (MonadTest, Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras as H
+import Hedgehog (MonadTest, Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras qualified as H
 
 -- | Execute me with:
 -- @cabal test cardano-cli-test --test-options '-p "/governance committee checks wrong hash fails/"'@
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/DRep.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/DRep.hs
index c0e2cde7d7..10af11ff98 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/DRep.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/DRep.hs
@@ -3,20 +3,29 @@
 
 module Test.Cli.Governance.DRep where
 
-import           Cardano.Api (MonadIO)
-
-import           Control.Monad
-import           Control.Monad.Catch (MonadCatch)
-import           Control.Monad.Trans.Control (MonadBaseControl)
-
-import           Test.Cardano.CLI.Hash (exampleAnchorDataHash, exampleAnchorDataIpfsHash,
-                   exampleAnchorDataPathTest, serveFilesWhile, tamperBase16Hash)
-import           Test.Cardano.CLI.Util (execCardanoCLI, execCardanoCLIWithEnvVars, expectFailure,
-                   propertyOnce)
-
-import           Hedgehog
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
+import Cardano.Api (MonadIO)
+
+import Control.Monad
+import Control.Monad.Catch (MonadCatch)
+import Control.Monad.Trans.Control (MonadBaseControl)
+
+import Test.Cardano.CLI.Hash
+  ( exampleAnchorDataHash
+  , exampleAnchorDataIpfsHash
+  , exampleAnchorDataPathTest
+  , serveFilesWhile
+  , tamperBase16Hash
+  )
+import Test.Cardano.CLI.Util
+  ( execCardanoCLI
+  , execCardanoCLIWithEnvVars
+  , expectFailure
+  , propertyOnce
+  )
+
+import Hedgehog
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
 
 metadataUrls :: [String]
 metadataUrls =
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/Hash.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/Hash.hs
index 6106d27cee..cbe22c84f0 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/Hash.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/Hash.hs
@@ -3,14 +3,14 @@
 
 module Test.Cli.Governance.Hash where
 
-import           Control.Monad (forM_, void)
-import           Text.Regex.TDFA ((=~))
+import Control.Monad (forM_, void)
+import Text.Regex.TDFA ((=~))
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras as H
+import Hedgehog (Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras qualified as H
 
 -- | Execute me with:
 -- @cabal test cardano-cli-test --test-options '-p "/governance committee key hash/"'@
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/Vote.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/Vote.hs
index 4ec5934308..f54de280cf 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/Vote.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/Vote.hs
@@ -2,20 +2,29 @@
 
 module Test.Cli.Governance.Vote where
 
-import           Cardano.Api (MonadIO)
+import Cardano.Api (MonadIO)
 
-import           Control.Monad (void)
-import           Control.Monad.Catch (MonadCatch)
-import           Control.Monad.Trans.Control (MonadBaseControl)
+import Control.Monad (void)
+import Control.Monad.Catch (MonadCatch)
+import Control.Monad.Trans.Control (MonadBaseControl)
 
-import           Test.Cardano.CLI.Hash (exampleAnchorDataHash, exampleAnchorDataIpfsHash,
-                   exampleAnchorDataPathTest, serveFilesWhile, tamperBase16Hash)
-import           Test.Cardano.CLI.Util (execCardanoCLIWithEnvVars, expectFailure, noteInputFile,
-                   propertyOnce)
+import Test.Cardano.CLI.Hash
+  ( exampleAnchorDataHash
+  , exampleAnchorDataIpfsHash
+  , exampleAnchorDataPathTest
+  , serveFilesWhile
+  , tamperBase16Hash
+  )
+import Test.Cardano.CLI.Util
+  ( execCardanoCLIWithEnvVars
+  , expectFailure
+  , noteInputFile
+  , propertyOnce
+  )
 
-import           Hedgehog (MonadTest, Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras as H
+import Hedgehog (MonadTest, Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras qualified as H
 
 -- | Execute me with:
 -- @cabal test cardano-cli-test --test-options '-p "/governance vote create wrong hash fails/"'@
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Hash.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Hash.hs
index 370f5e07fd..7268ee1a12 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Hash.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Hash.hs
@@ -2,20 +2,24 @@
 
 module Test.Cli.Hash where
 
-import           Control.Monad (void)
-import           Control.Monad.IO.Class
-import           Data.List (intercalate)
-import           GHC.IO.Exception (ExitCode (..))
-import           System.Directory (getCurrentDirectory)
-import           System.FilePath (dropTrailingPathSeparator)
-import           System.FilePath.Posix (splitDirectories)
+import Control.Monad (void)
+import Control.Monad.IO.Class
+import Data.List (intercalate)
+import GHC.IO.Exception (ExitCode (..))
+import System.Directory (getCurrentDirectory)
+import System.FilePath (dropTrailingPathSeparator)
+import System.FilePath.Posix (splitDirectories)
 
-import           Test.Cardano.CLI.Hash (exampleAnchorDataHash, exampleAnchorDataIpfsHash,
-                   exampleAnchorDataPathTest, serveFilesWhile)
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Hash
+  ( exampleAnchorDataHash
+  , exampleAnchorDataIpfsHash
+  , exampleAnchorDataPathTest
+  , serveFilesWhile
+  )
+import Test.Cardano.CLI.Util
 
-import           Hedgehog as H
-import qualified Hedgehog.Extras as H
+import Hedgehog as H
+import Hedgehog.Extras qualified as H
 
 -- | Execute me with:
 -- @cabal test cardano-cli-test --test-options '-p "/generate anchor data hash from file/"'@
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/ITN.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/ITN.hs
index 2c4c3868a0..acf58d3caa 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/ITN.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/ITN.hs
@@ -8,21 +8,21 @@ module Test.Cli.ITN
   )
 where
 
-import           Cardano.CLI.Run.Key (decodeBech32)
+import Cardano.CLI.Run.Key (decodeBech32)
 
-import qualified Codec.Binary.Bech32 as Bech32
-import           Control.Monad (void)
-import           Data.ByteString (ByteString)
-import qualified Data.ByteString.Base16 as Base16
-import           Data.Text (Text)
-import qualified Data.Text.IO as Text
+import Codec.Binary.Bech32 qualified as Bech32
+import Control.Monad (void)
+import Data.ByteString (ByteString)
+import Data.ByteString.Base16 qualified as Base16
+import Data.Text (Text)
+import Data.Text.IO qualified as Text
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property, (===))
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property, (===))
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 {- HLINT ignore "Reduce duplication" -}
 
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Json.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Json.hs
index 3c3c8f483e..21041f9f8d 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Json.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Json.hs
@@ -6,23 +6,27 @@ module Test.Cli.Json
   )
 where
 
-import           Cardano.Api.Shelley
+import Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Output (QueryKesPeriodInfoOutput (..), createOpCertIntervalInfo)
+import Cardano.CLI.Types.Common
+import Cardano.CLI.Types.Output (QueryKesPeriodInfoOutput (..), createOpCertIntervalInfo)
 
-import           Data.Aeson
-import           Data.Time
-import           Data.Time.Clock.POSIX (posixSecondsToUTCTime)
-import           Data.Word (Word64)
-import           GHC.Exts (IsList (..))
+import Data.Aeson
+import Data.Time
+import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
+import Data.Word (Word64)
+import GHC.Exts (IsList (..))
 
-import           Test.Gen.Cardano.Api.Typed (genLovelace, genSlotNo, genStakeAddress,
-                   genVerificationKeyHash)
+import Test.Gen.Cardano.Api.Typed
+  ( genLovelace
+  , genSlotNo
+  , genStakeAddress
+  , genVerificationKeyHash
+  )
 
-import           Hedgehog (Gen, Property, forAll, property, tripping)
-import           Hedgehog.Gen as Gen
-import           Hedgehog.Range as Range
+import Hedgehog (Gen, Property, forAll, property, tripping)
+import Hedgehog.Gen as Gen
+import Hedgehog.Range as Range
 
 -- TODO: Move to cardano-api
 hprop_json_roundtrip_delegations_and_rewards :: Property
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/MonadWarning.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/MonadWarning.hs
index 871689de6c..424b329f2f 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/MonadWarning.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/MonadWarning.hs
@@ -3,12 +3,12 @@ module Test.Cli.MonadWarning
   )
 where
 
-import           Cardano.CLI.Types.MonadWarning (MonadWarning, reportIssue, runWarningStateT)
+import Cardano.CLI.Types.MonadWarning (MonadWarning, reportIssue, runWarningStateT)
 
-import           Control.Monad (when)
-import           Control.Monad.Trans.State (State, runState)
+import Control.Monad (when)
+import Control.Monad.Trans.State (State, runState)
 
-import           Hedgehog (Property, property, (===))
+import Hedgehog (Property, property, (===))
 
 hprop_monad_warning :: Property
 hprop_monad_warning = property $ do
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Parser.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Parser.hs
index d95769aaae..aca53d0c98 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Parser.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Parser.hs
@@ -9,21 +9,23 @@ module Test.Cli.Parser
   )
 where
 
-import           Cardano.CLI.EraBased.Options.Common (integralParsecParser,
-                   pairIntegralParsecParser)
+import Cardano.CLI.EraBased.Options.Common
+  ( integralParsecParser
+  , pairIntegralParsecParser
+  )
 
-import           Data.Bits (Bits)
-import           Data.Data (Proxy (..), Typeable)
-import           Data.Either (isLeft, isRight)
-import           Data.Word (Word16)
-import qualified Text.Parsec as Parsec
+import Data.Bits (Bits)
+import Data.Data (Proxy (..), Typeable)
+import Data.Either (isLeft, isRight)
+import Data.Word (Word16)
+import Text.Parsec qualified as Parsec
 
-import           Hedgehog (Gen, Property, assert, property, (===))
-import           Hedgehog.Extras (assertWith, propertyOnce)
-import qualified Hedgehog.Gen as Gen
-import           Hedgehog.Internal.Property (forAll)
-import qualified Hedgehog.Range as Gen
-import qualified Hedgehog.Range as Range
+import Hedgehog (Gen, Property, assert, property, (===))
+import Hedgehog.Extras (assertWith, propertyOnce)
+import Hedgehog.Gen qualified as Gen
+import Hedgehog.Internal.Property (forAll)
+import Hedgehog.Range qualified as Gen
+import Hedgehog.Range qualified as Range
 
 -- | Execute me with:
 -- @cabal test cardano-cli-test --test-options '-p "/integral reader/"'@
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise1.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise1.hs
index 9824e4adad..7af33448db 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise1.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise1.hs
@@ -6,13 +6,13 @@ module Test.Cli.Pioneers.Exercise1
   )
 where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 -- | 1. Generate a key pair
 --   2. Check for the existence of the key pair
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise2.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise2.hs
index 70e0e76b24..92b43fe60a 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise2.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise2.hs
@@ -5,13 +5,13 @@ module Test.Cli.Pioneers.Exercise2
   )
 where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 -- | 1. We generate a payment signing key
 --   2. We create a tx body
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise3.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise3.hs
index 3bde21bf9b..04439337f1 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise3.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise3.hs
@@ -5,13 +5,13 @@ module Test.Cli.Pioneers.Exercise3
   )
 where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 -- | 1. Create KES key pair.
 --   2. Create cold keys.
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise4.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise4.hs
index 4fb7765f26..5d9efd77b5 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise4.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise4.hs
@@ -5,13 +5,13 @@ module Test.Cli.Pioneers.Exercise4
   )
 where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 -- | 1. Generate a stake verification key
 --   2. Create a stake address registration certificate
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise5.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise5.hs
index 8fb7554d06..415b6640fb 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise5.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise5.hs
@@ -5,13 +5,13 @@ module Test.Cli.Pioneers.Exercise5
   )
 where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 -- | 1. We generate a payment signing key
 --   2. We create a tx body
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise6.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise6.hs
index c2731ffad8..3d1d2c8a8f 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise6.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Pioneers/Exercise6.hs
@@ -5,13 +5,13 @@ module Test.Cli.Pioneers.Exercise6
   )
 where
 
-import           Control.Monad (void)
+import Control.Monad (void)
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (Property)
-import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
+import Hedgehog (Property)
+import Hedgehog.Extras.Test.Base qualified as H
+import Hedgehog.Extras.Test.File qualified as H
 
 -- | 1. We generate a payment signing key
 --   2. We create a tx body
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Certificates/StakePool.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Certificates/StakePool.hs
index 94617d6dea..e2bafee4bd 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Certificates/StakePool.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Certificates/StakePool.hs
@@ -2,21 +2,31 @@
 
 module Test.Cli.Shelley.Certificates.StakePool where
 
-import           Cardano.Api (MonadIO)
-
-import           Control.Monad (void)
-import           Control.Monad.Catch (MonadCatch)
-import           Control.Monad.Trans.Control (MonadBaseControl)
-
-import           Test.Cardano.CLI.Hash (exampleAnchorDataHash, exampleAnchorDataIpfsHash,
-                   exampleAnchorDataPathTest, serveFilesWhile, tamperBase16Hash)
-import           Test.Cardano.CLI.Util (execCardanoCLI, execCardanoCLIWithEnvVars, expectFailure,
-                   noteTempFile, propertyOnce)
-
-import           Hedgehog (MonadTest)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras as H
-import           Hedgehog.Internal.Property (Property)
+import Cardano.Api (MonadIO)
+
+import Control.Monad (void)
+import Control.Monad.Catch (MonadCatch)
+import Control.Monad.Trans.Control (MonadBaseControl)
+
+import Test.Cardano.CLI.Hash
+  ( exampleAnchorDataHash
+  , exampleAnchorDataIpfsHash
+  , exampleAnchorDataPathTest
+  , serveFilesWhile
+  , tamperBase16Hash
+  )
+import Test.Cardano.CLI.Util
+  ( execCardanoCLI
+  , execCardanoCLIWithEnvVars
+  , expectFailure
+  , noteTempFile
+  , propertyOnce
+  )
+
+import Hedgehog (MonadTest)
+import Hedgehog qualified as H
+import Hedgehog.Extras qualified as H
+import Hedgehog.Internal.Property (Property)
 
 exampleStakePoolMetadataHash :: String
 exampleStakePoolMetadataHash = "8241de08075886a7d09c847c9bbd1719459dac0bd0a2f085e673611ebb9a5965"
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Run/Hash.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Run/Hash.hs
index 7d733ba9a2..d357b5947d 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Run/Hash.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Run/Hash.hs
@@ -2,16 +2,16 @@
 
 module Test.Cli.Shelley.Run.Hash where
 
-import           Control.Monad (void)
-import           Control.Monad.Catch (MonadCatch)
-import           Control.Monad.Trans.Resource (MonadResource)
-import           GHC.Stack
+import Control.Monad (void)
+import Control.Monad.Catch (MonadCatch)
+import Control.Monad.Trans.Resource (MonadResource)
+import GHC.Stack
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (MonadTest, Property)
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras as H
+import Hedgehog (MonadTest, Property)
+import Hedgehog qualified as H
+import Hedgehog.Extras qualified as H
 
 hprop_hash_trip :: Property
 hprop_hash_trip =
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Run/Query.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Run/Query.hs
index 2930763bca..e67920093e 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Run/Query.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Run/Query.hs
@@ -3,11 +3,11 @@ module Test.Cli.Shelley.Run.Query
   )
 where
 
-import qualified Cardano.CLI.EraBased.Run.Query as Q
-import           Cardano.Slotting.Time (RelativeTime (..))
+import Cardano.CLI.EraBased.Run.Query qualified as Q
+import Cardano.Slotting.Time (RelativeTime (..))
 
-import           Hedgehog (Property, (===))
-import qualified Hedgehog.Extras.Test.Base as H
+import Hedgehog (Property, (===))
+import Hedgehog.Extras.Test.Base qualified as H
 
 hprop_percentage :: Property
 hprop_percentage = H.propertyOnce $ do
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Transaction/Build.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Transaction/Build.hs
index e6b4a88188..6a88eae1f0 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Transaction/Build.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Transaction/Build.hs
@@ -1,14 +1,14 @@
 module Test.Cli.Shelley.Transaction.Build where
 
-import           Data.List (isInfixOf)
-import           System.Exit (ExitCode (..))
-import           System.FilePath ((</>))
+import Data.List (isInfixOf)
+import System.Exit (ExitCode (..))
+import System.FilePath ((</>))
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog
-import qualified Hedgehog as H
-import qualified Hedgehog.Extras.Test.Base as H
+import Hedgehog
+import Hedgehog qualified as H
+import Hedgehog.Extras.Test.Base qualified as H
 
 inputDir :: FilePath
 inputDir = "test/cardano-cli-test/files/input/shelley/transaction"
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Transaction/Compatible/Build.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Transaction/Compatible/Build.hs
index d7509a55d2..4fddb72f60 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Transaction/Compatible/Build.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Shelley/Transaction/Compatible/Build.hs
@@ -2,21 +2,21 @@
 
 module Test.Cli.Shelley.Transaction.Compatible.Build where
 
-import           Cardano.Api.Internal.Eras
-import           Cardano.Api.Internal.Pretty
+import Cardano.Api.Internal.Eras
+import Cardano.Api.Internal.Pretty
 
-import           Control.Monad.Catch (MonadCatch)
-import           Control.Monad.IO.Class
-import           Data.Aeson (Value)
-import qualified Data.Aeson as A
-import           Data.Char (toLower)
-import           Data.String (IsString (..))
-import           GHC.Stack
+import Control.Monad.Catch (MonadCatch)
+import Control.Monad.IO.Class
+import Data.Aeson (Value)
+import Data.Aeson qualified as A
+import Data.Char (toLower)
+import Data.String (IsString (..))
+import GHC.Stack
 
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Util
 
-import           Hedgehog
-import qualified Hedgehog.Extras as H
+import Hedgehog
+import Hedgehog.Extras qualified as H
 
 inputDir :: FilePath
 inputDir = "test/cardano-cli-test/files/input/shelley/transaction"
diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/VerificationKey.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/VerificationKey.hs
index a63355e0e4..9244d8b4c6 100644
--- a/cardano-cli/test/cardano-cli-test/Test/Cli/VerificationKey.hs
+++ b/cardano-cli/test/cardano-cli-test/Test/Cli/VerificationKey.hs
@@ -2,16 +2,16 @@
 -- https://github.com/IntersectMBO/cardano-cli/issues/651
 module Test.Cli.VerificationKey where
 
-import           Control.Monad.Catch (MonadCatch)
-import           Control.Monad.IO.Class (MonadIO)
-import           GHC.Stack (HasCallStack)
-import qualified GHC.Stack as GHC
+import Control.Monad.Catch (MonadCatch)
+import Control.Monad.IO.Class (MonadIO)
+import GHC.Stack (HasCallStack)
+import GHC.Stack qualified as GHC
 
-import           Test.Cardano.CLI.Aeson (assertEqualModuloDesc)
-import           Test.Cardano.CLI.Util
+import Test.Cardano.CLI.Aeson (assertEqualModuloDesc)
+import Test.Cardano.CLI.Util
 
-import           Hedgehog (MonadTest, Property)
-import qualified Hedgehog.Extras.Test.Base as H
+import Hedgehog (MonadTest, Property)
+import Hedgehog.Extras.Test.Base qualified as H
 
 -- | Execute me with:
 -- @cabal test cardano-cli-test --test-options '-p "/verification key drep/"'@
diff --git a/flake.nix b/flake.nix
index 5fcdbbe03b..c15d54d58b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -101,7 +101,6 @@
               fourmolu = "0.18.0.0";
               haskell-language-server.src = nixpkgs.haskell-nix.sources."hls-2.9";
               hlint = "3.8";
-              stylish-haskell = "0.14.6.0";
             };
           # and from nixpkgs or other inputs
           shell.nativeBuildInputs = with nixpkgs; [gh jq yq-go actionlint shellcheck] ++ (lib.optional isDarwin macOS-security);
diff --git a/fourmolu.yaml b/fourmolu.yaml
index 8fb937cd1d..a7fef2e706 100644
--- a/fourmolu.yaml
+++ b/fourmolu.yaml
@@ -3,10 +3,44 @@ column-limit: 100
 function-arrows: leading
 comma-style: leading
 import-export-style: leading
-# we need https://github.com/IntersectMBO/cardano-api/pull/744/ to ditch stylish
-import-grouping: legacy
-indent-wheres: false 
-record-brace-space: false 
+import-grouping:
+  - rules:
+    - glob: Cardano.Api**
+  - rules:
+    - glob: Cardano**
+    - glob: Ouroboros**
+    - glob: PlutusCore**
+    - glob: PlutusLedgerApi**
+  - rules:
+    - glob: Prelude**
+    - glob: RIO**
+  - rules:
+    - glob: Control**
+    - glob: Codec**
+    - glob: Data**
+    - glob: Formatting**
+    - glob: GHC**
+    - glob: Lens**
+    - glob: Network**
+    - glob: Numeric**
+    - glob: Options**
+    - glob: Prettyprinter**
+    - glob: System**
+    - glob: Text**
+  - rules:
+    - glob: Test.Gen.Cardano.Api**
+  - rules:
+    - glob: Test.Cardano**
+    - glob: Test.Gen.Cardano**
+  - rules:
+    - glob: Hedgehog**
+    - glob: Test**
+  - name: "The rest"
+    rules:
+    - match: all
+      priority: 100
+indent-wheres: false
+record-brace-space: false
 newlines-between-decls: 1
 haddock-style: single-line
 haddock-style-module:
diff --git a/scripts/devshell/prettify b/scripts/devshell/prettify
index 873de484d6..691fdf1e00 100755
--- a/scripts/devshell/prettify
+++ b/scripts/devshell/prettify
@@ -3,7 +3,7 @@
 # Function to display help message
 show_help() {
     echo "Usage: $(basename $0) <OPTION|FILES>"
-    echo "Format Haskell source files using fourmolu and stylish-haskell."
+    echo "Format Haskell source files using fourmolu."
     echo ""
     echo "Options:"
     echo "  -t, --tracked           Format all tracked Haskell (*.hs) files in the repository"
@@ -39,7 +39,6 @@ run_format() {
               echo -e "${green_colour}Formatting: ${blue_colour}${relative_path}${reset_colour}"
               fourmolu -q -i "$top_level/$relative_path"
               fourmolu -q -i "$top_level/$relative_path"
-              stylish-haskell -i "$top_level/$relative_path"
             fi
         fi
     done
@@ -91,7 +90,7 @@ for file in $files; do
   fi
 done
 
-for tool in stylish-haskell fourmolu
+for tool in fourmolu
 do
   if ! (which $tool > /dev/null 2>&1); then
     echo "ERROR: $tool is not available!"