diff --git a/TrackedControllerFix/HarmonyPatches.cs b/TrackedControllerFix/HarmonyPatches.cs
index 3af71d1..ad37b78 100644
--- a/TrackedControllerFix/HarmonyPatches.cs
+++ b/TrackedControllerFix/HarmonyPatches.cs
@@ -10,11 +10,7 @@ class PlayerSetupPatches
     [HarmonyPatch(typeof(PlayerSetup), nameof(PlayerSetup.Start))]
     static void Post_PlayerSetup_Start(ref PlayerSetup __instance)
     {
-        var leftFixer = __instance.vrLeftHandTracker.AddComponent<TrackedControllerFixer>();
-        leftFixer.inputSource = SteamVR_Input_Sources.LeftHand;
-        leftFixer.Initialize();
-        var rightFixer = __instance.vrRightHandTracker.AddComponent<TrackedControllerFixer>();
-        rightFixer.inputSource = SteamVR_Input_Sources.RightHand;
-        rightFixer.Initialize();
+        __instance.vrLeftHandTracker.AddComponent<TrackedControllerFixer>().inputSource = SteamVR_Input_Sources.LeftHand;
+        __instance.vrRightHandTracker.AddComponent<TrackedControllerFixer>().inputSource = SteamVR_Input_Sources.RightHand;
     }
 }
\ No newline at end of file
diff --git a/TrackedControllerFix/TrackedControllerFix.cs b/TrackedControllerFix/TrackedControllerFixer.cs
similarity index 97%
rename from TrackedControllerFix/TrackedControllerFix.cs
rename to TrackedControllerFix/TrackedControllerFixer.cs
index ec0fcbb..1b265ce 100644
--- a/TrackedControllerFix/TrackedControllerFix.cs
+++ b/TrackedControllerFix/TrackedControllerFixer.cs
@@ -11,10 +11,10 @@ public class TrackedControllerFixer : MonoBehaviour
     SteamVR_TrackedObject trackedObject;
     SteamVR_Behaviour_Pose oldBehaviourPose;
     SteamVR_Action_Pose actionPose;
-    
+
     SteamVR_RenderModel renderModel;
 
-    public void Initialize()
+    void Awake()
     {
         trackedObject = gameObject.AddComponent<SteamVR_TrackedObject>();
         oldBehaviourPose = gameObject.GetComponent<SteamVR_Behaviour_Pose>();
@@ -46,9 +46,7 @@ public class TrackedControllerFixer : MonoBehaviour
     void Update()
     {
         if (deviceIndex < 0)
-        {
             CheckDeviceIndex();
-        }
     }
 
     void OnDeviceConnectedChanged(SteamVR_Action_Pose changedAction, SteamVR_Input_Sources changedSource, bool connected)