diff --git a/dali/DALI/gear/gear_action.py b/dali/DALI/gear/gear_action.py
index 59725db..0b53699 100644
--- a/dali/DALI/gear/gear_action.py
+++ b/dali/DALI/gear/gear_action.py
@@ -92,10 +92,7 @@ def write_gear_frame_and_wait(
 ) -> None:
     logger.debug("write gear frame and wait for finish")
     frame = address_byte << 8 | opcode_byte
-    dali.transmit(
-        DaliFrame(length=DaliFrameLength.GEAR, data=frame, send_twice=send_twice),
-        block=True,
-    )
+    dali.transmit(DaliFrame(length=DaliFrameLength.GEAR, data=frame, send_twice=send_twice), block=True)
 
 
 @typechecked
diff --git a/dali/DALI/gear/gear_enumerate.py b/dali/DALI/gear/gear_enumerate.py
index e68a601..acc8c67 100644
--- a/dali/DALI/gear/gear_enumerate.py
+++ b/dali/DALI/gear/gear_enumerate.py
@@ -11,18 +11,20 @@
 
 def prepare_bus(dali: DaliInterface) -> None:
     # INITIALISE ALL
-    write_gear_frame_and_wait(dali, GearSpecialCommandOpcode.INITIALISE, 0, True)
+    write_gear_frame_and_wait(dali, GearSpecialCommandOpcode.INITIALISE, 0xFF, True)
 
 
 def clear_short_addresses(dali: DaliInterface) -> None:
     set_gear_dtr0(dali, 0xFF)
     address = GearAddress()
+    address.broadcast()
     write_gear_frame_and_wait(dali, address.byte, GearConfigureCommandOpcode.SET_SHORT_ADDRESS, True)
 
 
 def remove_from_all_groups(dali: DaliInterface) -> None:
     for group in range(DaliMax.GEAR_GROUP):
         address = GearAddress()
+        address.broadcast()
         write_gear_frame_and_wait(dali, address.byte, GearConfigureCommandOpcode.REMOVE_GROUP + group, True)
 
 
@@ -64,7 +66,7 @@ def set_short_address(dali: DaliInterface, new_short_address: int) -> bool:
         GearSpecialCommandOpcode.PROGRAM_SHORT_ADDRESS,
         ((new_short_address << 1) | 1),
     )
-    data = (GearSpecialCommandOpcode.VERIFY_SHORT_ADDRESS << 8) + (((new_short_address << 1) | 1) & 0xFF)
+    data = (GearSpecialCommandOpcode.VERIFY_SHORT_ADDRESS << 8) | ((new_short_address << 1) | 1)
     result = dali.query_reply(DaliFrame(length=DaliFrameLength.GEAR, data=data))
     if result.length == DaliFrameLength.BACKWARD:
         write_gear_frame(dali, GearSpecialCommandOpcode.WITHDRAW)
diff --git a/dali/DALI/gear/gear_query.py b/dali/DALI/gear/gear_query.py
index 09b766b..7f6bc81 100644
--- a/dali/DALI/gear/gear_query.py
+++ b/dali/DALI/gear/gear_query.py
@@ -1,9 +1,8 @@
 """Control gear query command implementations."""
 
 import click
-from dali_interface import DaliInterface
-
 from dali.DALI.device.device_query import device_address_option
+from dali_interface import DaliInterface
 
 from .gear_action import query_gear_and_display_reply, query_gear_value
 from .gear_opcode import GearQueryCommandOpcode
diff --git a/tests/cli/test_device_query.py b/tests/cli/test_device_query.py
index d994343..f7f24ca 100644
--- a/tests/cli/test_device_query.py
+++ b/tests/cli/test_device_query.py
@@ -2,7 +2,6 @@
 
 import pytest
 from click.testing import CliRunner
-
 from dali.DALI.system.constants import DaliMax
 from dali.dali_cli import cli
 
diff --git a/tests/cli/test_device_special.py b/tests/cli/test_device_special.py
index 2437f41..e446e98 100644
--- a/tests/cli/test_device_special.py
+++ b/tests/cli/test_device_special.py
@@ -2,7 +2,6 @@
 
 import pytest
 from click.testing import CliRunner
-
 from dali.dali_cli import cli
 
 
diff --git a/tests/cli/test_gear_basic.py b/tests/cli/test_gear_basic.py
index 6986eed..fa4a56f 100644
--- a/tests/cli/test_gear_basic.py
+++ b/tests/cli/test_gear_basic.py
@@ -2,7 +2,6 @@
 
 import pytest
 from click.testing import CliRunner
-
 from dali.dali_cli import cli
 
 
diff --git a/tests/cli/test_gear_configure.py b/tests/cli/test_gear_configure.py
index bdccecd..6ea38d4 100644
--- a/tests/cli/test_gear_configure.py
+++ b/tests/cli/test_gear_configure.py
@@ -2,7 +2,6 @@
 
 import pytest
 from click.testing import CliRunner
-
 from dali.dali_cli import cli
 
 
diff --git a/tests/cli/test_gear_special.py b/tests/cli/test_gear_special.py
index f6a8557..fcfc653 100644
--- a/tests/cli/test_gear_special.py
+++ b/tests/cli/test_gear_special.py
@@ -2,7 +2,6 @@
 
 import pytest
 from click.testing import CliRunner
-
 from dali.dali_cli import cli