diff --git a/src/dodal/beamlines/i22.py b/src/dodal/beamlines/i22.py
index 0a38d2f282..0937f5d59a 100644
--- a/src/dodal/beamlines/i22.py
+++ b/src/dodal/beamlines/i22.py
@@ -4,10 +4,10 @@
 from ophyd_async.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
+    device_factory,
     device_instantiation,
     get_directory_provider,
     set_directory_provider,
-    device_factory
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import numbered_slits
diff --git a/src/dodal/common/beamlines/beamline_utils.py b/src/dodal/common/beamlines/beamline_utils.py
index 6f29137a6e..de7ae40859 100644
--- a/src/dodal/common/beamlines/beamline_utils.py
+++ b/src/dodal/common/beamlines/beamline_utils.py
@@ -1,11 +1,21 @@
 import inspect
-from typing import Callable, Dict, Final, Generic, List, Optional, Protocol, TypeVar, cast
+from typing import (
+    Callable,
+    Dict,
+    Final,
+    Generic,
+    List,
+    Optional,
+    Protocol,
+    TypeVar,
+    cast,
+)
 
 from bluesky.run_engine import call_in_bluesky_event_loop
 from ophyd import Device as OphydV1Device
 from ophyd.sim import make_fake_device
-from ophyd_async.core import Device as OphydV2Device
 from ophyd_async.core import DEFAULT_TIMEOUT
+from ophyd_async.core import Device as OphydV2Device
 from ophyd_async.core import wait_for_connection as v2_device_wait_for_connection
 
 from dodal.common.types import UpdatingDirectoryProvider