diff --git a/ASTExtension/Extensions/PlayerSetupExtensions.cs b/ASTExtension/Extensions/PlayerSetupExtensions.cs
index 241cd1e..7fa9e5b 100644
--- a/ASTExtension/Extensions/PlayerSetupExtensions.cs
+++ b/ASTExtension/Extensions/PlayerSetupExtensions.cs
@@ -1,4 +1,5 @@
-using ABI_RC.Core.Player;
+using ABI_RC.Core;
+using ABI_RC.Core.Player;
 using UnityEngine;
 
 namespace NAK.ASTExtension.Extensions;
@@ -17,7 +18,7 @@ public static class PlayerSetupExtensions
         Vector3 localScale = playerSetup._avatar.transform.localScale;
         Vector3 initialScale = playerSetup.initialScale;
         float initialHeight = playerSetup._initialAvatarHeight;
-        Vector3 scaleDifference = PlayerSetup.DivideVectors(localScale - initialScale, initialScale);
+        Vector3 scaleDifference = CVRTools.DivideVectors(localScale - initialScale, initialScale);
         return initialHeight + initialHeight * scaleDifference.y;
     }
 }
\ No newline at end of file
diff --git a/ASTExtension/Integrations/BTKUI/BtkUiAddon.cs b/ASTExtension/Integrations/BTKUI/BtkUiAddon.cs
index 8c57cb7..cbb7534 100644
--- a/ASTExtension/Integrations/BTKUI/BtkUiAddon.cs
+++ b/ASTExtension/Integrations/BTKUI/BtkUiAddon.cs
@@ -3,41 +3,41 @@ using BTKUILib;
 using BTKUILib.UIObjects;
 using BTKUILib.UIObjects.Components;
 
-namespace NAK.ASTExtension.Integrations
+namespace NAK.ASTExtension.Integrations;
+
+public static partial class BtkUiAddon
 {
-    public static partial class BtkUiAddon
+    public static void Initialize()
     {
-        public static void Initialize()
-        {
             Prepare_Icons();
             Setup_PlayerSelectPage();
         }
         
-        private static void Prepare_Icons()
-        {
+    private static void Prepare_Icons()
+    {
             QuickMenuAPI.PrepareIcon(ASTExtensionMod.ModName, "ASM_Icon_AvatarHeightCopy",
                 GetIconStream("ASM_Icon_AvatarHeightCopy.png"));
         }
 
-        #region Player Select Page
+    #region Player Select Page
 
-        private static string _selectedPlayer;
+    private static string _selectedPlayer;
         
-        private static void Setup_PlayerSelectPage()
-        {
+    private static void Setup_PlayerSelectPage()
+    {
             QuickMenuAPI.OnPlayerSelected += OnPlayerSelected;
             Category category = QuickMenuAPI.PlayerSelectPage.AddCategory(ASTExtensionMod.ModName, ASTExtensionMod.ModName);
             Button button = category.AddButton("Copy Height", "ASM_Icon_AvatarHeightCopy", "Copy selected players Eye Height.");
             button.OnPress += OnCopyPlayerHeight;
         }
         
-        private static void OnPlayerSelected(string _, string id)
-        {
+    private static void OnPlayerSelected(string _, string id)
+    {
             _selectedPlayer = id;
         }
         
-        private static void OnCopyPlayerHeight()
-        {
+    private static void OnCopyPlayerHeight()
+    {
             if (string.IsNullOrEmpty(_selectedPlayer))
                 return;
             
@@ -51,6 +51,5 @@ namespace NAK.ASTExtension.Integrations
             ASTExtensionMod.Instance.SetAvatarHeight(height);
         }
         
-        #endregion Player Select Page
-    }
+    #endregion Player Select Page
 }
\ No newline at end of file
diff --git a/ASTExtension/Integrations/BTKUI/BtkUiAddon_Utils.cs b/ASTExtension/Integrations/BTKUI/BtkUiAddon_Utils.cs
index 3dd1c30..7b3f569 100644
--- a/ASTExtension/Integrations/BTKUI/BtkUiAddon_Utils.cs
+++ b/ASTExtension/Integrations/BTKUI/BtkUiAddon_Utils.cs
@@ -1,18 +1,17 @@
 using System.Reflection;
 
-namespace NAK.ASTExtension.Integrations
+namespace NAK.ASTExtension.Integrations;
+
+public static partial class BtkUiAddon
 {
-    public static partial class BtkUiAddon
-    {
-        #region Icon Utils
+    #region Icon Utils
         
-        private static Stream GetIconStream(string iconName)
-        {
+    private static Stream GetIconStream(string iconName)
+    {
             Assembly assembly = Assembly.GetExecutingAssembly();
             string assemblyName = assembly.GetName().Name;
             return assembly.GetManifestResourceStream($"{assemblyName}.Resources.{iconName}");
         }
 
-        #endregion Icon Utils
-    }
+    #endregion Icon Utils
 }
\ No newline at end of file