diff --git a/DesktopVRSwitch/VRModeSwitchManager.cs b/DesktopVRSwitch/VRModeSwitchManager.cs
index 7c3b985..cb6ebf7 100644
--- a/DesktopVRSwitch/VRModeSwitchManager.cs
+++ b/DesktopVRSwitch/VRModeSwitchManager.cs
@@ -44,10 +44,9 @@ public class VRModeSwitchManager : MonoBehaviour
     }
 
     // Settings
-    public bool _useWorldTransition = true;
-    public bool _reloadLocalAvatar = true;
-
-    // Info
+    public bool UseWorldTransition = true;
+    public bool ReloadLocalAvatar = true;
+    
     public bool SwitchInProgress { get; private set; }
 
     void Awake()
@@ -75,12 +74,12 @@ public class VRModeSwitchManager : MonoBehaviour
         yield return null;
 
 
-        if (_useWorldTransition)
+        if (UseWorldTransition)
         {   // start visual transition and wait for it to complete
             WorldTransitionSystem.Instance.StartTransition();
             yield return new WaitForSeconds(WorldTransitionSystem.Instance.CurrentInLength);
         }
-        
+
         // Check if OpenVR is running
         bool isUsingVr = IsInVR();
 
@@ -100,7 +99,7 @@ public class VRModeSwitchManager : MonoBehaviour
         if (isUsingVr != IsInVR())
         {
             // reload the local avatar
-            if (_reloadLocalAvatar)
+            if (ReloadLocalAvatar)
             {
                 Utils.ClearLocalAvatar();
                 Utils.ReloadLocalAvatar();
@@ -113,9 +112,9 @@ public class VRModeSwitchManager : MonoBehaviour
             InvokeOnFailedSwitch(!isUsingVr);
         }
 
-        if (_useWorldTransition)
+        if (UseWorldTransition)
         {   // would be cool to have out length
-            WorldTransitionSystem.Instance.ContinueTransitionCoroutine();
+            WorldTransitionSystem.Instance.ContinueTransition();
             yield return new WaitForSeconds(WorldTransitionSystem.Instance.CurrentInLength);
         }
 
diff --git a/DesktopVRSwitch/VRModeTrackers/CVRWorldTracker.cs b/DesktopVRSwitch/VRModeTrackers/CVRWorldTracker.cs
index 51563e8..daceab3 100644
--- a/DesktopVRSwitch/VRModeTrackers/CVRWorldTracker.cs
+++ b/DesktopVRSwitch/VRModeTrackers/CVRWorldTracker.cs
@@ -25,7 +25,7 @@ public class CVRWorldTracker : VRModeTracker
         CVRWorld.Instance.UpdatePostProcessing();
         UpdateCVRDesktopCameraController();
     }
-    
+
     private void UpdateCVRDesktopCameraController()
     {
         // Just making sure- Starting in VR will not call Start() as rig is disabled
diff --git a/DesktopVRSwitch/VRModeTrackers/CheckVRTracker.cs b/DesktopVRSwitch/VRModeTrackers/CheckVRTracker.cs
index 7dfa7e4..15abb85 100644
--- a/DesktopVRSwitch/VRModeTrackers/CheckVRTracker.cs
+++ b/DesktopVRSwitch/VRModeTrackers/CheckVRTracker.cs
@@ -16,14 +16,6 @@ public class CheckVRTracker : VRModeTracker
 
     private void OnPostSwitch(bool intoVR)
     {
-        CheckVR _checkVR = CheckVR.Instance;
-        if (_checkVR == null)
-        {
-            DesktopVRSwitch.Logger.Error("Error while getting CheckVR!");
-            return;
-        }
-        DesktopVRSwitch.Logger.Msg($"Setting CheckVR hasVrDeviceLoaded to {intoVR}.");
-
-        _checkVR.hasVrDeviceLoaded = intoVR;
+        CheckVR.Instance.hasVrDeviceLoaded = intoVR;
     }
 }
\ No newline at end of file
diff --git a/DesktopVRSwitch/VRModeTrackers/IKSystemTracker.cs b/DesktopVRSwitch/VRModeTrackers/IKSystemTracker.cs
index f70c081..fe8dc28 100644
--- a/DesktopVRSwitch/VRModeTrackers/IKSystemTracker.cs
+++ b/DesktopVRSwitch/VRModeTrackers/IKSystemTracker.cs
@@ -52,7 +52,7 @@ public class IKSystemTracker : VRModeTracker
         BodySystem.isCalibratedAsFullBody = false;
         BodySystem.isCalibrating = false;
         BodySystem.isRecalibration = false;
-        
+
         // Make it so you don't instantly end up in FBT from Desktop
         IKSystem.firstAvatarLoaded = DesktopVRSwitch.EntryEnterCalibrationOnSwitch.Value;
 
diff --git a/DesktopVRSwitch/VRModeTrackers/MovementSystemTracker.cs b/DesktopVRSwitch/VRModeTrackers/MovementSystemTracker.cs
index 884cd0c..cd39ed9 100644
--- a/DesktopVRSwitch/VRModeTrackers/MovementSystemTracker.cs
+++ b/DesktopVRSwitch/VRModeTrackers/MovementSystemTracker.cs
@@ -35,7 +35,7 @@ public class MovementSystemTracker : VRModeTracker
         MovementSystem.Instance.ChangeCrouch(false);
         MovementSystem.Instance.ChangeProne(false);
         MovementSystem.Instance.SetImmobilized(true);
-        
+
     }
 
     private void OnFailedSwitch(bool intoVR)
@@ -50,7 +50,7 @@ public class MovementSystemTracker : VRModeTracker
         // Lazy
         MelonLoader.MelonCoroutines.Start(TeleportFrameAfter(intoVR));
     }
-    
+
     private IEnumerator TeleportFrameAfter(bool intoVR)
     {
         yield return null; // need to wait a frame
@@ -66,7 +66,7 @@ public class MovementSystemTracker : VRModeTracker
         MovementSystem.Instance.ChangeCrouch(false);
         MovementSystem.Instance.ChangeProne(false);
         MovementSystem.Instance.SetImmobilized(false);
-        
+
         yield break;
     }
 }
\ No newline at end of file