diff --git a/osu.Desktop.VisualTests/Tests/TestCaseOptionsContainer.cs b/osu.Desktop.VisualTests/Tests/TestCaseOptionsContainer.cs
index 7d1f2bda3c..9ee61c89e8 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseOptionsContainer.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseOptionsContainer.cs
@@ -1,11 +1,8 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Allocation;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Game.Overlays;
 using osu.Game.Screens.Play.Options;
 
 namespace osu.Desktop.VisualTests.Tests
diff --git a/osu.Game/Overlays/Music/CollectionsDropdown.cs b/osu.Game/Overlays/Music/CollectionsDropdown.cs
index 04dd446f01..fd2ef23b9c 100644
--- a/osu.Game/Overlays/Music/CollectionsDropdown.cs
+++ b/osu.Game/Overlays/Music/CollectionsDropdown.cs
@@ -11,60 +11,63 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
-public class CollectionsDropdown<T> : OsuDropdown<T>
+namespace osu.Game.Overlays.Music
 {
-    protected override DropdownHeader CreateHeader() => new CollectionsHeader { AccentColour = AccentColour };
-    protected override Menu CreateMenu() => new CollectionsMenu();
-
-    [BackgroundDependencyLoader]
-    private void load(OsuColour colours)
+    public class CollectionsDropdown<T> : OsuDropdown<T>
     {
-        AccentColour = colours.Gray6;
-    }
+        protected override DropdownHeader CreateHeader() => new CollectionsHeader { AccentColour = AccentColour };
+        protected override Menu CreateMenu() => new CollectionsMenu();
 
-    private class CollectionsHeader : OsuDropdownHeader
-    {
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            BackgroundColour = colours.Gray4;
+            AccentColour = colours.Gray6;
         }
 
-        public CollectionsHeader()
+        private class CollectionsHeader : OsuDropdownHeader
         {
-            CornerRadius = 5;
-            Height = 30;
-            Icon.TextSize = 14;
-            Icon.Margin = new MarginPadding(0);
-            Foreground.Padding = new MarginPadding { Top = 4, Bottom = 4, Left = 10, Right = 10 };
-            EdgeEffect = new EdgeEffect
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
             {
-                Type = EdgeEffectType.Shadow,
-                Colour = Color4.Black.Opacity(0.3f),
-                Radius = 3,
-                Offset = new Vector2(0f, 1f),
-            };
+                BackgroundColour = colours.Gray4;
+            }
+
+            public CollectionsHeader()
+            {
+                CornerRadius = 5;
+                Height = 30;
+                Icon.TextSize = 14;
+                Icon.Margin = new MarginPadding(0);
+                Foreground.Padding = new MarginPadding { Top = 4, Bottom = 4, Left = 10, Right = 10 };
+                EdgeEffect = new EdgeEffect
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Colour = Color4.Black.Opacity(0.3f),
+                    Radius = 3,
+                    Offset = new Vector2(0f, 1f),
+                };
+            }
+        }
+
+        private class CollectionsMenu : OsuMenu
+        {
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                Background.Colour = colours.Gray4;
+            }
+
+            public CollectionsMenu()
+            {
+                CornerRadius = 5;
+                EdgeEffect = new EdgeEffect
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Colour = Color4.Black.Opacity(0.3f),
+                    Radius = 3,
+                    Offset = new Vector2(0f, 1f),
+                };
+            }
         }
     }
-
-    private class CollectionsMenu : OsuMenu
-    {
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            Background.Colour = colours.Gray4;
-        }
-
-        public CollectionsMenu()
-        {
-            CornerRadius = 5;
-            EdgeEffect = new EdgeEffect
-            {
-                Type = EdgeEffectType.Shadow,
-                Colour = Color4.Black.Opacity(0.3f),
-                Radius = 3,
-                Offset = new Vector2(0f, 1f),
-            };
-        }
-    }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Screens/Play/Options/CollectionOptions.cs b/osu.Game/Screens/Play/Options/CollectionOptions.cs
index e0bd54e91c..1a87c1c778 100644
--- a/osu.Game/Screens/Play/Options/CollectionOptions.cs
+++ b/osu.Game/Screens/Play/Options/CollectionOptions.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Configuration;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays.Music;
 using System.Collections.Generic;
diff --git a/osu.Game/Screens/Play/Options/DiscussionOptions.cs b/osu.Game/Screens/Play/Options/DiscussionOptions.cs
index fbaf636637..39d2f6c379 100644
--- a/osu.Game/Screens/Play/Options/DiscussionOptions.cs
+++ b/osu.Game/Screens/Play/Options/DiscussionOptions.cs
@@ -1,33 +1,33 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays.Settings;
-
-namespace osu.Game.Screens.Play.Options
-{
-    public class DiscussionOptions : OptionContainer
-    {
-        public override string Title => @"DISCUSSIONS";
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            Add(new SettingsCheckbox
-            {
-                LabelText = "Show floating coments",
-                Bindable = config.GetBindable<bool>(OsuSetting.FloatingComments)
-            });
-            Add(new FocusedTextBox
-            {
-                RelativeSizeAxes = Axes.X,
-                Height = 30,
-                PlaceholderText = "Add Comment",
-                HoldFocus = false,
-            });
-        }
-    }
-}
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Settings;
+
+namespace osu.Game.Screens.Play.Options
+{
+    public class DiscussionOptions : OptionContainer
+    {
+        public override string Title => @"DISCUSSIONS";
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            Add(new SettingsCheckbox
+            {
+                LabelText = "Show floating coments",
+                Bindable = config.GetBindable<bool>(OsuSetting.FloatingComments)
+            });
+            Add(new FocusedTextBox
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = 30,
+                PlaceholderText = "Add Comment",
+                HoldFocus = false,
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/Options/OptionContainer.cs b/osu.Game/Screens/Play/Options/OptionContainer.cs
index 24e3d3a054..f7818a7d4c 100644
--- a/osu.Game/Screens/Play/Options/OptionContainer.cs
+++ b/osu.Game/Screens/Play/Options/OptionContainer.cs
@@ -19,10 +19,9 @@ namespace osu.Game.Screens.Play.Options
         /// </summary>
         public abstract string Title { get; }
 
-        private Container header;
-        private FillFlowContainer content;
+        private readonly FillFlowContainer content;
 
-        public OptionContainer()
+        protected OptionContainer()
         {
             AutoSizeAxes = Axes.Y;
             Width = 250;
@@ -47,7 +46,7 @@ namespace osu.Game.Screens.Play.Options
 
                     Children = new Drawable[]
                     {
-                        header = new Container
+                        new Container
                         {
                             RelativeSizeAxes = Axes.X,
                             Height = 30,