diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/OpenWindows.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/OpenWindows.cs
index 34e5a2c8c2..7e5c0efae0 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/OpenWindows.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/OpenWindows.cs
@@ -78,7 +78,7 @@ internal sealed class OpenWindows
             lock (_enumWindowsLock)
             {
                 windows.Clear();
-                EnumWindowsProc callbackptr = new EnumWindowsProc(WindowEnumerationCallBack);
+                var callbackptr = new EnumWindowsProc(WindowEnumerationCallBack);
                 _ = NativeMethods.EnumWindows(callbackptr, tokenHandleParam);
             }
         }
@@ -109,7 +109,7 @@ internal sealed class OpenWindows
             return false;
         }
 
-        Window newWindow = new Window(hwnd);
+        var newWindow = new Window(hwnd);
 
         if (newWindow.IsWindow && newWindow.Visible && newWindow.IsOwner &&
             (!newWindow.IsToolWindow || newWindow.IsAppWindow) && !newWindow.TaskListDeleted &&
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/Window.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/Window.cs
index c071d55e80..d6cc6281f7 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/Window.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/Window.cs
@@ -51,7 +51,7 @@ internal sealed class Window
             var sizeOfTitle = NativeMethods.GetWindowTextLength(hwnd);
             if (sizeOfTitle++ > 0)
             {
-                StringBuilder titleBuffer = new StringBuilder(sizeOfTitle);
+                var titleBuffer = new StringBuilder(sizeOfTitle);
                 var numCharactersWritten = NativeMethods.GetWindowText(hwnd, titleBuffer, sizeOfTitle);
                 if (numCharactersWritten == 0)
                 {
@@ -260,7 +260,7 @@ internal sealed class Window
     /// <returns>The state (minimized, maximized, etc..) of the window</returns>
     internal WindowSizeState GetWindowSizeState()
     {
-        NativeMethods.GetWindowPlacement(Hwnd, out WINDOWPLACEMENT placement);
+        NativeMethods.GetWindowPlacement(Hwnd, out var placement);
 
         switch (placement.ShowCmd)
         {
@@ -332,7 +332,7 @@ internal sealed class Window
     /// <returns>Class name</returns>
     private static string GetWindowClassName(IntPtr hwnd)
     {
-        StringBuilder windowClassName = new StringBuilder(300);
+        var windowClassName = new StringBuilder(300);
         var numCharactersWritten = NativeMethods.GetClassName(hwnd, windowClassName, windowClassName.MaxCapacity);
 
         if (numCharactersWritten == 0)
@@ -384,7 +384,7 @@ internal sealed class Window
             {
                 new Task(() =>
                 {
-                    EnumWindowsProc callbackptr = new EnumWindowsProc((IntPtr hwnd, IntPtr lParam) =>
+                    var callbackptr = new EnumWindowsProc((IntPtr hwnd, IntPtr lParam) =>
                     {
                         // Every uwp app main window has at least three child windows. Only the one we are interested in has a class starting with "Windows.UI.Core." and is assigned to the real app process.
                         // (The other ones have a class name that begins with the string "ApplicationFrame".)
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/WindowProcess.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/WindowProcess.cs
index 2dfbbcf429..b32c6c9697 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/WindowProcess.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/WindowProcess.cs
@@ -197,7 +197,7 @@ internal sealed class WindowProcess
     internal static string GetProcessNameFromProcessID(uint pid)
     {
         var processHandle = NativeMethods.OpenProcess(ProcessAccessFlags.QueryLimitedInformation, true, (int)pid);
-        StringBuilder processName = new StringBuilder(MaximumFileNameLength);
+        var processName = new StringBuilder(MaximumFileNameLength);
 
         if (NativeMethods.GetProcessImageFileName(processHandle, processName, MaximumFileNameLength) != 0)
         {
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/VirtualDesktopHelper.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/VirtualDesktopHelper.cs
index 886c376749..9b017f59b8 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/VirtualDesktopHelper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/VirtualDesktopHelper.cs
@@ -97,7 +97,7 @@ public class VirtualDesktopHelper
         var registryExplorerVirtualDesktops = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\VirtualDesktops"; // Windows 11
 
         // List of all desktops
-        using RegistryKey? virtualDesktopKey = Registry.CurrentUser.OpenSubKey(registryExplorerVirtualDesktops, false);
+        using var virtualDesktopKey = Registry.CurrentUser.OpenSubKey(registryExplorerVirtualDesktops, false);
         if (virtualDesktopKey is not null)
         {
             var allDeskValue = (byte[]?)virtualDesktopKey.GetValue("VirtualDesktopIDs", null) ?? Array.Empty<byte>();
@@ -123,7 +123,7 @@ public class VirtualDesktopHelper
 
         // Guid for current desktop
         var virtualDesktopsKeyName = _isWindowsEleven ? registryExplorerVirtualDesktops : registrySessionVirtualDesktops;
-        using RegistryKey? virtualDesktopsKey = Registry.CurrentUser.OpenSubKey(virtualDesktopsKeyName, false);
+        using var virtualDesktopsKey = Registry.CurrentUser.OpenSubKey(virtualDesktopsKeyName, false);
         if (virtualDesktopsKey is not null)
         {
             var currentVirtualDesktopValue = virtualDesktopsKey.GetValue("CurrentVirtualDesktop", null);
@@ -166,8 +166,8 @@ public class VirtualDesktopHelper
             UpdateDesktopList();
         }
 
-        List<VDesktop> list = new List<VDesktop>();
-        foreach (Guid d in _availableDesktops)
+        var list = new List<VDesktop>();
+        foreach (var d in _availableDesktops)
         {
             list.Add(CreateVDesktopInstance(d));
         }
@@ -265,7 +265,7 @@ public class VirtualDesktopHelper
         var defaultName = string.Format(System.Globalization.CultureInfo.InvariantCulture, VirtualDesktopHelperDesktop, GetDesktopNumber(desktop));
 
         var registryPath = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\VirtualDesktops\\Desktops\\{" + desktop.ToString().ToUpper(System.Globalization.CultureInfo.InvariantCulture) + "}";
-        using RegistryKey? deskSubKey = Registry.CurrentUser.OpenSubKey(registryPath, false);
+        using var deskSubKey = Registry.CurrentUser.OpenSubKey(registryPath, false);
         var desktopName = deskSubKey?.GetValue("Name");
 
         return (desktopName is not null) ? (string)desktopName : defaultName;
@@ -336,7 +336,7 @@ public class VirtualDesktopHelper
             return CreateVDesktopInstance(Guid.Empty);
         }
 
-        var hr = _virtualDesktopManager.GetWindowDesktopId(hWindow, out Guid desktopId);
+        var hr = _virtualDesktopManager.GetWindowDesktopId(hWindow, out var desktopId);
         return (hr != (int)HRESULT.S_OK || desktopId == Guid.Empty) ? VDesktop.Empty : CreateVDesktopInstance(desktopId, hWindow);
     }
 
@@ -355,7 +355,7 @@ public class VirtualDesktopHelper
         }
 
         _ = _virtualDesktopManager.IsWindowOnCurrentVirtualDesktop(hWindow, out var isOnCurrentDesktop);
-        Guid windowDesktopId = desktop ?? Guid.Empty; // Prepare variable in case we have no input parameter for desktop
+        var windowDesktopId = desktop ?? Guid.Empty; // Prepare variable in case we have no input parameter for desktop
         var hResult = desktop is null ? GetWindowDesktopId(hWindow, out windowDesktopId) : 0;
 
         if (hResult != (int)HRESULT.S_OK)
@@ -438,7 +438,7 @@ public class VirtualDesktopHelper
     /// <returns><see langword="True"/> on success and <see langword="false"/> on failure.</returns>
     public bool MoveWindowOneDesktopLeft(IntPtr hWindow)
     {
-        var hr = GetWindowDesktopId(hWindow, out Guid windowDesktop);
+        var hr = GetWindowDesktopId(hWindow, out var windowDesktop);
         if (hr != (int)HRESULT.S_OK)
         {
             ExtensionHost.LogMessage(new LogMessage() { Message = $"VirtualDesktopHelper.MoveWindowOneDesktopLeft() failed when moving the window ({hWindow}) one desktop left: Can't get current desktop of the window." });
@@ -458,7 +458,7 @@ public class VirtualDesktopHelper
             return false;
         }
 
-        Guid newDesktop = _availableDesktops[windowDesktopNumber - 1];
+        var newDesktop = _availableDesktops[windowDesktopNumber - 1];
         return MoveWindowToDesktop(hWindow, ref newDesktop);
     }
 
@@ -469,7 +469,7 @@ public class VirtualDesktopHelper
     /// <returns><see langword="True"/> on success and <see langword="false"/> on failure.</returns>
     public bool MoveWindowOneDesktopRight(IntPtr hWindow)
     {
-        var hr = GetWindowDesktopId(hWindow, out Guid windowDesktop);
+        var hr = GetWindowDesktopId(hWindow, out var windowDesktop);
         if (hr != (int)HRESULT.S_OK)
         {
             ExtensionHost.LogMessage(new LogMessage() { Message = $"VirtualDesktopHelper.MoveWindowOneDesktopRight() failed when moving the window ({hWindow}) one desktop right: Can't get current desktop of the window." });
@@ -489,7 +489,7 @@ public class VirtualDesktopHelper
             return false;
         }
 
-        Guid newDesktop = _availableDesktops[windowDesktopNumber + 1];
+        var newDesktop = _availableDesktops[windowDesktopNumber + 1];
         return MoveWindowToDesktop(hWindow, ref newDesktop);
     }
 
@@ -507,7 +507,7 @@ public class VirtualDesktopHelper
         }
 
         // Can be only detected if method is invoked with window handle parameter.
-        VirtualDesktopAssignmentType desktopType = (hWindow != default) ? GetWindowDesktopAssignmentType(hWindow, desktop) : VirtualDesktopAssignmentType.Unknown;
+        var desktopType = (hWindow != default) ? GetWindowDesktopAssignmentType(hWindow, desktop) : VirtualDesktopAssignmentType.Unknown;
         var isAllDesktops = (hWindow != default) && desktopType == VirtualDesktopAssignmentType.AllDesktops;
         var isDesktopVisible = (hWindow != default) ? (isAllDesktops || desktopType == VirtualDesktopAssignmentType.CurrentDesktop) : IsDesktopVisible(desktop);