diff --git a/Intersect.Client/Interface/Menu/MenuGuiBase.cs b/Intersect.Client/Interface/Menu/MenuGuiBase.cs
index 2251b37476..e9a136cba5 100644
--- a/Intersect.Client/Interface/Menu/MenuGuiBase.cs
+++ b/Intersect.Client/Interface/Menu/MenuGuiBase.cs
@@ -55,37 +55,38 @@ public void Update()
         MainMenu.Update();
     }
 
-    public void Draw() => _menuCanvas.RenderCanvas();
+    public void Draw()
+    {
+        _menuCanvas.RenderCanvas();
+    }
 
-    public void Reset() => _shouldReset = true;
+    public void Reset()
+    {
+        _shouldReset = true;
+    }
 
     //Dispose
-    public void Dispose() => _menuCanvas.Dispose();
+    public void Dispose()
+    {
+        _menuCanvas.Dispose();
+    }
 
     /// <inheritdoc />
     public List<Base> Children => MainMenu.Children;
 
     /// <inheritdoc />
-    public TElement Create<TElement>(params object[] parameters) where TElement : Base
-    {
-        return MainMenu.Create<TElement>(parameters);
-    }
+    public TElement Create<TElement>(params object[] parameters) where TElement : Base =>
+        MainMenu.Create<TElement>(parameters);
 
     /// <inheritdoc />
-    public TElement? Find<TElement>(string? name = null, bool recurse = false) where TElement : Base
-    {
-        return MainMenu.Find<TElement>(name, recurse);
-    }
+    public TElement? Find<TElement>(string? name = null, bool recurse = false) where TElement : Base =>
+        MainMenu.Find<TElement>(name, recurse);
 
     /// <inheritdoc />
-    public IEnumerable<TElement?> FindAll<TElement>(bool recurse = false) where TElement : Base
-    {
-        return MainMenu.FindAll<TElement>(recurse);
-    }
+    public IEnumerable<TElement?> FindAll<TElement>(bool recurse = false) where TElement : Base =>
+        MainMenu.FindAll<TElement>(recurse);
 
     /// <inheritdoc />
-    public void Remove<TElement>(TElement element, bool dispose = false) where TElement : Base
-    {
+    public void Remove<TElement>(TElement element, bool dispose = false) where TElement : Base =>
         MainMenu.Remove(element, dispose);
-    }
 }
diff --git a/Intersect.Client/Interface/Shared/SettingsWindow.cs b/Intersect.Client/Interface/Shared/SettingsWindow.cs
index 3563171255..b7cf28fb8c 100644
--- a/Intersect.Client/Interface/Shared/SettingsWindow.cs
+++ b/Intersect.Client/Interface/Shared/SettingsWindow.cs
@@ -96,7 +96,7 @@ public partial class SettingsWindow : ImagePanel
     private bool _returnToMenu;
 
     // Initialize.
-    public SettingsWindow(Base parent, MainMenu? mainMenu, EscapeMenu? escapeMenu) : base(parent, "SettingsWindow")
+    public SettingsWindow(Base parent, MainMenu? mainMenu, EscapeMenu? escapeMenu) : base(parent, nameof(SettingsWindow))
     {
         // Assign References.
         _mainMenu = mainMenu;