diff --git a/buttons.py b/buttons.py
index a974081..b7e7267 100644
--- a/buttons.py
+++ b/buttons.py
@@ -23,7 +23,7 @@ class Buttons:
         self.byte_3 = 0
 
         # generating methods for each button
-        def gen_methods(byte, bit):
+        def button_method_factory(byte, bit):
             def flip():
                 setattr(self, byte, flip_bit(getattr(self, byte), bit))
 
@@ -32,32 +32,32 @@ class Buttons:
             return flip, getter
 
         # byte 1
-        self.y, self.y_is_set = gen_methods('byte_1', 0)
-        self.x, self.x_is_set = gen_methods('byte_1', 1)
-        self.b, self.b_is_set = gen_methods('byte_1', 2)
-        self.a, self.a_is_set = gen_methods('byte_1', 3)
-        self.right_sr, self.right_sr_is_set = gen_methods('byte_1', 4)
-        self.right_sl, self.right_sl_is_set = gen_methods('byte_1', 5)
-        self.r, self.r_is_set = gen_methods('byte_1', 6)
-        self.zr, self.zr_is_set = gen_methods('byte_1', 7)
+        self.y, self.y_is_set = button_method_factory('byte_1', 0)
+        self.x, self.x_is_set = button_method_factory('byte_1', 1)
+        self.b, self.b_is_set = button_method_factory('byte_1', 2)
+        self.a, self.a_is_set = button_method_factory('byte_1', 3)
+        self.right_sr, self.right_sr_is_set = button_method_factory('byte_1', 4)
+        self.right_sl, self.right_sl_is_set = button_method_factory('byte_1', 5)
+        self.r, self.r_is_set = button_method_factory('byte_1', 6)
+        self.zr, self.zr_is_set = button_method_factory('byte_1', 7)
 
         # byte 2
-        self.minus, self.minus_is_set = gen_methods('byte_2', 0)
-        self.plus, self.plus_is_set = gen_methods('byte_2', 1)
-        self.r_stick, self.r_stick_is_set = gen_methods('byte_2', 2)
-        self.l_stick, self.l_stick_is_set = gen_methods('byte_2', 3)
-        self.home, self.home_is_set = gen_methods('byte_2', 4)
-        self.capture, self.capture_is_set = gen_methods('byte_2', 5)
+        self.minus, self.minus_is_set = button_method_factory('byte_2', 0)
+        self.plus, self.plus_is_set = button_method_factory('byte_2', 1)
+        self.r_stick, self.r_stick_is_set = button_method_factory('byte_2', 2)
+        self.l_stick, self.l_stick_is_set = button_method_factory('byte_2', 3)
+        self.home, self.home_is_set = button_method_factory('byte_2', 4)
+        self.capture, self.capture_is_set = button_method_factory('byte_2', 5)
 
         # byte 3
-        self.down, self.down_is_set = gen_methods('byte_3', 0)
-        self.up, self.up_is_set = gen_methods('byte_3', 1)
-        self.right, self.right_is_set = gen_methods('byte_3', 2)
-        self.left, self.left_is_set = gen_methods('byte_3', 3)
-        self.left_sr, self.left_sr_is_set = gen_methods('byte_3', 4)
-        self.left_sl, self.left_sl_is_set = gen_methods('byte_3', 5)
-        self.l, self.l_is_set = gen_methods('byte_3', 6)
-        self.zl, self.zl_is_set = gen_methods('byte_3', 7)
+        self.down, self.down_is_set = button_method_factory('byte_3', 0)
+        self.up, self.up_is_set = button_method_factory('byte_3', 1)
+        self.right, self.right_is_set = button_method_factory('byte_3', 2)
+        self.left, self.left_is_set = button_method_factory('byte_3', 3)
+        self.left_sr, self.left_sr_is_set = button_method_factory('byte_3', 4)
+        self.left_sl, self.left_sl_is_set = button_method_factory('byte_3', 5)
+        self.l, self.l_is_set = button_method_factory('byte_3', 6)
+        self.zl, self.zl_is_set = button_method_factory('byte_3', 7)
 
     """
     Example for generated methods: home button (byte_2, 4)
diff --git a/run_and_pair_switch.py b/run_and_pair_switch.py
index 9f44eab..5d62269 100644
--- a/run_and_pair_switch.py
+++ b/run_and_pair_switch.py
@@ -1,7 +1,6 @@
 import asyncio
 import logging
 import os
-import random
 import socket
 
 import logging_default as log