diff --git a/Ryujinx.Common/Configuration/ConfigurationState.cs b/Ryujinx.Common/Configuration/ConfigurationState.cs
index 7a365d325b..0ce9ba1e3b 100644
--- a/Ryujinx.Common/Configuration/ConfigurationState.cs
+++ b/Ryujinx.Common/Configuration/ConfigurationState.cs
@@ -48,7 +48,6 @@ namespace Ryujinx.Configuration
             /// <summary>
             /// Used to toggle columns in the GUI
             /// </summary>
-            // TODO: UPDATE THIS TO MASTER
             public Columns GuiColumns { get; private set; }
 
             /// <summary>
diff --git a/Ryujinx.HLE/Input/Hid.cs b/Ryujinx.HLE/Input/Hid.cs
index de8b179aa0..5cb7f09de6 100644
--- a/Ryujinx.HLE/Input/Hid.cs
+++ b/Ryujinx.HLE/Input/Hid.cs
@@ -53,18 +53,12 @@ namespace Ryujinx.HLE.Input
         {
             switch (controllerType)
             {
-                case ControllerType.Handheld:
-                    return ControllerStatus.Handheld;
-                case ControllerType.NpadLeft:
-                    return ControllerStatus.NpadLeft;
-                case ControllerType.NpadRight:
-                    return ControllerStatus.NpadRight;
-                case ControllerType.NpadPair:
-                    return ControllerStatus.NpadPair;
-                case ControllerType.ProController:
-                    return ControllerStatus.ProController;
-                default:
-                    throw new NotImplementedException();
+                case ControllerType.Handheld:      return ControllerStatus.Handheld;
+                case ControllerType.NpadLeft:      return ControllerStatus.NpadLeft;
+                case ControllerType.NpadRight:     return ControllerStatus.NpadRight;
+                case ControllerType.NpadPair:      return ControllerStatus.NpadPair;
+                case ControllerType.ProController: return ControllerStatus.ProController;
+                default:                           throw new NotImplementedException();
             }
         }
 
diff --git a/Ryujinx/Ui/MainWindow.cs b/Ryujinx/Ui/MainWindow.cs
index abc095eda6..c28846f85e 100644
--- a/Ryujinx/Ui/MainWindow.cs
+++ b/Ryujinx/Ui/MainWindow.cs
@@ -95,16 +95,16 @@ namespace Ryujinx.Ui
             _mainWin.Icon            = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.assets.Icon.png");
             _stopEmulation.Sensitive = false;
 
-            if (ConfigurationState.Instance.Ui.GuiColumns.FavColumn)        { _favToggle.Active        = true; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.IconColumn)       { _iconToggle.Active       = true; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.AppColumn)        { _appToggle.Active        = true; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.DevColumn)        { _developerToggle.Active  = true; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.VersionColumn)    { _versionToggle.Active    = true; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.TimePlayedColumn) { _timePlayedToggle.Active = true; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.LastPlayedColumn) { _lastPlayedToggle.Active = true; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.FileExtColumn)    { _fileExtToggle.Active    = true; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.FileSizeColumn)   { _fileSizeToggle.Active   = true; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.PathColumn)       { _pathToggle.Active       = true; }
+            if (ConfigurationState.Instance.Ui.GuiColumns.FavColumn)        _favToggle.Active        = true;
+            if (ConfigurationState.Instance.Ui.GuiColumns.IconColumn)       _iconToggle.Active       = true;
+            if (ConfigurationState.Instance.Ui.GuiColumns.AppColumn)        _appToggle.Active        = true;
+            if (ConfigurationState.Instance.Ui.GuiColumns.DevColumn)        _developerToggle.Active  = true;
+            if (ConfigurationState.Instance.Ui.GuiColumns.VersionColumn)    _versionToggle.Active    = true;
+            if (ConfigurationState.Instance.Ui.GuiColumns.TimePlayedColumn) _timePlayedToggle.Active = true;
+            if (ConfigurationState.Instance.Ui.GuiColumns.LastPlayedColumn) _lastPlayedToggle.Active = true;
+            if (ConfigurationState.Instance.Ui.GuiColumns.FileExtColumn)    _fileExtToggle.Active    = true;
+            if (ConfigurationState.Instance.Ui.GuiColumns.FileSizeColumn)   _fileSizeToggle.Active   = true;
+            if (ConfigurationState.Instance.Ui.GuiColumns.PathColumn)       _pathToggle.Active       = true;
 
             _gameTable.Model = _tableStore = new ListStore(
                 typeof(bool),
@@ -184,15 +184,15 @@ namespace Ryujinx.Ui
                 else if (column.Title == "Path")        { _pathColumn       = column; }
             }
 
-            if (ConfigurationState.Instance.Ui.GuiColumns.FavColumn)        { _favColumn.SortColumnId        = 0; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.AppColumn)        { _appColumn.SortColumnId        = 2; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.DevColumn)        { _devColumn.SortColumnId        = 3; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.VersionColumn)    { _versionColumn.SortColumnId    = 4; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.TimePlayedColumn) { _timePlayedColumn.SortColumnId = 5; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.LastPlayedColumn) { _lastPlayedColumn.SortColumnId = 6; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.FileExtColumn)    { _fileExtColumn.SortColumnId    = 7; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.FileSizeColumn)   { _fileSizeColumn.SortColumnId   = 8; }
-            if (ConfigurationState.Instance.Ui.GuiColumns.PathColumn)       { _pathColumn.SortColumnId       = 9; }
+            if (ConfigurationState.Instance.Ui.GuiColumns.FavColumn)        _favColumn.SortColumnId        = 0;
+            if (ConfigurationState.Instance.Ui.GuiColumns.AppColumn)        _appColumn.SortColumnId        = 2;
+            if (ConfigurationState.Instance.Ui.GuiColumns.DevColumn)        _devColumn.SortColumnId        = 3;
+            if (ConfigurationState.Instance.Ui.GuiColumns.VersionColumn)    _versionColumn.SortColumnId    = 4;
+            if (ConfigurationState.Instance.Ui.GuiColumns.TimePlayedColumn) _timePlayedColumn.SortColumnId = 5;
+            if (ConfigurationState.Instance.Ui.GuiColumns.LastPlayedColumn) _lastPlayedColumn.SortColumnId = 6;
+            if (ConfigurationState.Instance.Ui.GuiColumns.FileExtColumn)    _fileExtColumn.SortColumnId    = 7;
+            if (ConfigurationState.Instance.Ui.GuiColumns.FileSizeColumn)   _fileSizeColumn.SortColumnId   = 8;
+            if (ConfigurationState.Instance.Ui.GuiColumns.PathColumn)       _pathColumn.SortColumnId       = 9;
         }
 
         private HLE.Switch InitializeSwitchInstance()
@@ -563,7 +563,7 @@ namespace Ryujinx.Ui
             settingsWin.Show();
         }
 
-        private void Update_Pressed(object o, EventArgs args)
+        private void Update_Pressed(object sender, EventArgs args)
         {
             string ryuUpdater = System.IO.Path.Combine(new VirtualFileSystem().GetBasePath(), "RyuUpdater.exe");
 
@@ -647,7 +647,7 @@ namespace Ryujinx.Ui
             UpdateColumns();
         }
 
-        private void FileSize_Toggled(object o, EventArgs args)
+        private void FileSize_Toggled(object sender, EventArgs args)
         {
             ConfigurationState.Instance.Ui.GuiColumns.FileSizeColumn.Value = _fileSizeToggle.Active;
 
@@ -655,7 +655,7 @@ namespace Ryujinx.Ui
             UpdateColumns();
         }
 
-        private void Path_Toggled(object o, EventArgs args)
+        private void Path_Toggled(object sender, EventArgs args)
         {
             ConfigurationState.Instance.Ui.GuiColumns.PathColumn.Value = _pathToggle.Active;
 
diff --git a/Ryujinx/Ui/NpadController.cs b/Ryujinx/Ui/NpadController.cs
index a566946a45..67961b4914 100644
--- a/Ryujinx/Ui/NpadController.cs
+++ b/Ryujinx/Ui/NpadController.cs
@@ -24,11 +24,6 @@ namespace Ryujinx.Ui.Input
             return _inner.Enabled && Joystick.GetState(_inner.Index).IsConnected;
         }
 
-        public void Initialize()
-        {
-
-        }
-
         public ControllerButtons GetButtons()
         {
             if (!IsEnabled())