diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/GamepadWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/GamepadWidget.cs
index 5c92e3ad1..1a4408d53 100644
--- a/Dalamud/Interface/Internal/Windows/Data/Widgets/GamepadWidget.cs
+++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/GamepadWidget.cs
@@ -27,27 +27,6 @@ internal class GamepadWidget : IDataWindowWidget
     {
         var gamepadState = Service<GamepadState>.Get();
 
-        static void DrawHelper(string text, uint mask, Func<GamepadButtons, float> resolve)
-        {
-            ImGui.Text($"{text} {mask:X4}");
-            ImGui.Text($"DPadLeft {resolve(GamepadButtons.DpadLeft)} " +
-                       $"DPadUp {resolve(GamepadButtons.DpadUp)} " +
-                       $"DPadRight {resolve(GamepadButtons.DpadRight)} " +
-                       $"DPadDown {resolve(GamepadButtons.DpadDown)} ");
-            ImGui.Text($"West {resolve(GamepadButtons.West)} " +
-                       $"North {resolve(GamepadButtons.North)} " +
-                       $"East {resolve(GamepadButtons.East)} " +
-                       $"South {resolve(GamepadButtons.South)} ");
-            ImGui.Text($"L1 {resolve(GamepadButtons.L1)} " +
-                       $"L2 {resolve(GamepadButtons.L2)} " +
-                       $"R1 {resolve(GamepadButtons.R1)} " +
-                       $"R2 {resolve(GamepadButtons.R2)} ");
-            ImGui.Text($"Select {resolve(GamepadButtons.Select)} " +
-                       $"Start {resolve(GamepadButtons.Start)} " +
-                       $"L3 {resolve(GamepadButtons.L3)} " +
-                       $"R3 {resolve(GamepadButtons.R3)} ");
-        }
-
         ImGui.Text($"GamepadInput 0x{gamepadState.GamepadInputAddress.ToInt64():X}");
 
 #if DEBUG
@@ -58,29 +37,44 @@ internal class GamepadWidget : IDataWindowWidget
             ImGui.SetClipboardText($"0x{gamepadState.GamepadInputAddress.ToInt64():X}");
 #endif
 
-        DrawHelper(
+        this.DrawHelper(
             "Buttons Raw",
             gamepadState.ButtonsRaw,
             gamepadState.Raw);
-        DrawHelper(
+        this.DrawHelper(
             "Buttons Pressed",
             gamepadState.ButtonsPressed,
             gamepadState.Pressed);
-        DrawHelper(
+        this.DrawHelper(
             "Buttons Repeat",
             gamepadState.ButtonsRepeat,
             gamepadState.Repeat);
-        DrawHelper(
+        this.DrawHelper(
             "Buttons Released",
             gamepadState.ButtonsReleased,
             gamepadState.Released);
-        ImGui.Text($"LeftStickLeft {gamepadState.LeftStickLeft:0.00} " +
-                   $"LeftStickUp {gamepadState.LeftStickUp:0.00} " +
-                   $"LeftStickRight {gamepadState.LeftStickRight:0.00} " +
-                   $"LeftStickDown {gamepadState.LeftStickDown:0.00} ");
-        ImGui.Text($"RightStickLeft {gamepadState.RightStickLeft:0.00} " +
-                   $"RightStickUp {gamepadState.RightStickUp:0.00} " +
-                   $"RightStickRight {gamepadState.RightStickRight:0.00} " +
-                   $"RightStickDown {gamepadState.RightStickDown:0.00} ");
+        ImGui.Text($"LeftStick {gamepadState.LeftStick}");
+        ImGui.Text($"RightStick {gamepadState.RightStick}");
+    }
+    
+    private void DrawHelper(string text, uint mask, Func<GamepadButtons, float> resolve)
+    {
+        ImGui.Text($"{text} {mask:X4}");
+        ImGui.Text($"DPadLeft {resolve(GamepadButtons.DpadLeft)} " +
+                   $"DPadUp {resolve(GamepadButtons.DpadUp)} " +
+                   $"DPadRight {resolve(GamepadButtons.DpadRight)} " +
+                   $"DPadDown {resolve(GamepadButtons.DpadDown)} ");
+        ImGui.Text($"West {resolve(GamepadButtons.West)} " +
+                   $"North {resolve(GamepadButtons.North)} " +
+                   $"East {resolve(GamepadButtons.East)} " +
+                   $"South {resolve(GamepadButtons.South)} ");
+        ImGui.Text($"L1 {resolve(GamepadButtons.L1)} " +
+                   $"L2 {resolve(GamepadButtons.L2)} " +
+                   $"R1 {resolve(GamepadButtons.R1)} " +
+                   $"R2 {resolve(GamepadButtons.R2)} ");
+        ImGui.Text($"Select {resolve(GamepadButtons.Select)} " +
+                   $"Start {resolve(GamepadButtons.Start)} " +
+                   $"L3 {resolve(GamepadButtons.L3)} " +
+                   $"R3 {resolve(GamepadButtons.R3)} ");
     }
 }