diff --git a/cardano-api/src/Cardano/Api/Byron.hs b/cardano-api/src/Cardano/Api/Byron.hs
index b651f99e1..6dfea70b1 100644
--- a/cardano-api/src/Cardano/Api/Byron.hs
+++ b/cardano-api/src/Cardano/Api/Byron.hs
@@ -13,9 +13,6 @@ module Cardano.Api.Byron
 
     -- * Hashes
   , Hash (..)
-
-    -- * Payment addresses
-
     -- | Constructing and inspecting Byron payment addresses
   , NetworkId (Mainnet, Testnet)
 
@@ -73,18 +70,28 @@ module Cardano.Api.Byron
   , serializeByronTx
   , writeByronTxFileTextEnvelopeCddl
 
-    -- * Byron ledger
-  , ACertificate (..)
+    -- * Byron ledger re-exports
+
+    -- ** Address components
   , AddrAttributes (..)
   , Address
-  , ApplicationName (..)
-  , ATxAux (..)
-  , BlockCount (..)
-  , Certificate
-  , CompactTxIn
-  , CompactTxOut
+  , KeyHash
+  , addressDetailedF
+  , addressF
+  , addressHash
+  , checkVerKeyAddress
+  , decodeAddressBase58
+  , mkAttributes
+
+    -- ** Lovelace handling
+  , Lovelace
+  , LovelacePortion
+  , lovelacePortionToRational
+  , mkKnownLovelace
+  , rationalToLovelacePortion
+
+    -- ** Genesis configuration and AVVM
   , Config (..)
-  , EpochNumber (..)
   , FakeAvvmOptions (..)
   , GeneratedSecrets (..)
   , GenesisAvvmBalances (..)
@@ -96,48 +103,52 @@ module Cardano.Api.Byron
   , GenesisHash (..)
   , GenesisInitializer (..)
   , GenesisSpec (..)
-  , InstallerHash (..)
-  , KeyHash
-  , Lovelace
-  , LovelacePortion
   , NetworkMagic (..)
-  , NumSoftwareVersion
   , PoorSecret (..)
+  , TestnetBalanceOptions (..)
+  , TxFeePolicy (..)
+  , TxSizeLinear (..)
+  , generateGenesisData
+  , mkGenesisDelegation
+  , mkGenesisSpec
+  , readGenesisData
+
+    -- ** Updates
+  , ApplicationName (..)
+  , InstallerHash (..)
+  , NumSoftwareVersion
   , Proposal
   , ProtocolParameters (..)
   , ProtocolVersion (..)
-  , SlotNumber (..)
   , SoftforkRule (..)
   , SoftwareVersion (..)
   , SystemTag (..)
-  , TestnetBalanceOptions (..)
-  , TxFeePolicy (..)
-  , TxIn (..)
-  , TxOut (..)
-  , TxSizeLinear (..)
-  , UTxO (..)
   , Vote
-  , addressDetailedF
-  , addressF
-  , addressHash
   , checkApplicationName
   , checkSystemTag
-  , checkVerKeyAddress
+
+    -- ** Blocks, slots, and epochs
+  , BlockCount (..)
+  , EpochNumber (..)
+  , SlotNumber (..)
   , decCBORABlockOrBoundary
-  , decodeAddressBase58
+
+    -- ** UTxO components
+  , ATxAux (..)
+  , CompactTxIn
+  , CompactTxOut
+  , TxIn (..)
+  , TxOut (..)
+  , UTxO (..)
   , defaultUTxOConfiguration
   , fromCompactTxIn
   , fromCompactTxOut
-  , generateGenesisData
   , genesisUtxo
+
+    -- ** Delegation
+  , ACertificate (..)
+  , Certificate
   , isValid
-  , lovelacePortionToRational
-  , mkAttributes
-  , mkGenesisDelegation
-  , mkGenesisSpec
-  , mkKnownLovelace
-  , rationalToLovelacePortion
-  , readGenesisData
   , signCertificate
   )
 where