diff --git a/src/adn_server/application/bridge_use_cases.py b/src/adn_server/application/bridge_use_cases.py
index 9a52000..fc10ee7 100644
--- a/src/adn_server/application/bridge_use_cases.py
+++ b/src/adn_server/application/bridge_use_cases.py
@@ -38,11 +38,9 @@ from bitarray import bitarray
 from dmr_utils3 import bptc, decode
 from dmr_utils3.const import LC_OPT
 
-from .ports import DmrEmbeddedLcEncoder, TalkerAliasEmblcEncoder
-
 from ..domain import HBPF_DATA_SYNC, HBPF_SLT_VHEAD, HBPF_SLT_VTERM, STREAM_TO, bytes_3, bytes_4, int_id
 from ..domain.talker_alias import DMRA_BLOCK_COUNT
-from .ports import BridgeRouter
+from .ports import BridgeRouter, DmrEmbeddedLcEncoder, TalkerAliasEmblcEncoder
 from .talker_alias_use_cases import TalkerAliasUseCases, passthrough_complete, talker_alias_settings
 
 logger = logging.getLogger(__name__)
diff --git a/src/adn_server/application/talker_alias_use_cases.py b/src/adn_server/application/talker_alias_use_cases.py
index 9ac937a..a8b38aa 100644
--- a/src/adn_server/application/talker_alias_use_cases.py
+++ b/src/adn_server/application/talker_alias_use_cases.py
@@ -17,10 +17,10 @@ from ..domain.talker_alias import (
     build_dmra_packet,
     build_dmra_packets,
     decode_ta_from_blocks,
+    is_ta_header_byte,
     required_ta_block_count,
     talker_alias_decode_complete,
     truncate_talker_alias,
-    is_ta_header_byte,
 )
 from .ports import TalkerAliasEmblcEncoder
 
diff --git a/src/adn_server/infrastructure/config_reload.py b/src/adn_server/infrastructure/config_reload.py
index 69acc51..8302b36 100644
--- a/src/adn_server/infrastructure/config_reload.py
+++ b/src/adn_server/infrastructure/config_reload.py
@@ -12,7 +12,6 @@ from typing import Any, Callable
 
 from ..domain.errors import ConfigError
 from .config_loader import YamlConfigLoader
-from .logging_config import reapply_log_level
 from .config_normalizer import (
     apply_talker_alias_defaults,
     ensure_system_runtime_config,
@@ -20,6 +19,7 @@ from .config_normalizer import (
     normalize_obp_config,
     normalize_peer_config,
 )
+from .logging_config import reapply_log_level
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/adn_server/infrastructure/voice/pkt_gen.py b/src/adn_server/infrastructure/voice/pkt_gen.py
index f88e30a..850fc5e 100644
--- a/src/adn_server/infrastructure/voice/pkt_gen.py
+++ b/src/adn_server/infrastructure/voice/pkt_gen.py
@@ -31,9 +31,9 @@ from typing import Any, Iterator
 from bitarray import bitarray
 from dmr_utils3 import bptc
 from dmr_utils3.const import BS_DATA_SYNC, BS_VOICE_SYNC, EMB, LC_OPT, SLOT_TYPE
+from dmr_utils3.utils import bytes_4
 
 from ..dmr_bptc import encode_emblc
-from dmr_utils3.utils import bytes_4
 
 # Precalculated DMRD byte 15 (slot << 7 | this)
 HEADBITS = 0b00100001
diff --git a/src/adn_server/main.py b/src/adn_server/main.py
index bf94153..37951c2 100644
--- a/src/adn_server/main.py
+++ b/src/adn_server/main.py
@@ -58,8 +58,6 @@ from .domain import bytes_3
 from .domain.errors import ConfigError
 from .infrastructure import YamlConfigLoader, reopen_file_handlers, setup_logging
 from .infrastructure.bridge_router_impl import InMemoryBridgeRouter
-from .infrastructure.dmr_bptc import encode_emblc
-from .infrastructure.talker_alias_emblc import default_ta_emblc_encoder
 from .infrastructure.config_normalizer import (
     apply_talker_alias_defaults as _apply_talker_alias_defaults,
 )
@@ -76,11 +74,13 @@ from .infrastructure.config_normalizer import (
     normalize_peer_config as _normalize_peer_config,
 )
 from .infrastructure.config_reload import BindSpec, reload_server_config
+from .infrastructure.dmr_bptc import encode_emblc
 from .infrastructure.persistence import PickleSubMapStore
 from .infrastructure.persistence.alias_loader import DefaultAliasLoader
 from .infrastructure.persistence.keys_store import JsonKeysStore
 from .infrastructure.security.password_download import DefaultSecurityDownloader, StubSecurityDownloader
 from .infrastructure.security.user_passwords_loader import UserPasswordsLoader
+from .infrastructure.talker_alias_emblc import default_ta_emblc_encoder
 from .infrastructure.twisted_adapters.report_server import ReportServerFactory
 from .infrastructure.twisted_adapters.udp_hbp import HBPProtocolFactory
 from .infrastructure.voice import DefaultVoiceProvider, StubVoiceProvider