diff --git a/osu.Game/Overlays/Comments/CommentsHeader.cs b/osu.Game/Overlays/Comments/CommentsHeader.cs
index 2bd2bf21a6..1df347eb82 100644
--- a/osu.Game/Overlays/Comments/CommentsHeader.cs
+++ b/osu.Game/Overlays/Comments/CommentsHeader.cs
@@ -15,10 +15,7 @@ namespace osu.Game.Overlays.Comments
 {
     public class CommentsHeader : CompositeDrawable
     {
-        private const int height = 40;
-        private const int spacing = 10;
-        private const int padding = 50;
-        private const int text_size = 14;
+        private const int font_size = 14;
 
         public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
         public readonly BindableBool ShowDeleted = new BindableBool();
@@ -28,7 +25,8 @@ namespace osu.Game.Overlays.Comments
         public CommentsHeader()
         {
             RelativeSizeAxes = Axes.X;
-            Height = height;
+            Height = 40;
+
             AddRangeInternal(new Drawable[]
             {
                 background = new Box
@@ -38,14 +36,14 @@ namespace osu.Game.Overlays.Comments
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Horizontal = padding },
+                    Padding = new MarginPadding { Horizontal = 50 },
                     Children = new Drawable[]
                     {
                         new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(spacing, 0),
+                            Spacing = new Vector2(10, 0),
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             Children = new Drawable[]
@@ -54,7 +52,7 @@ namespace osu.Game.Overlays.Comments
                                 {
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
-                                    Font = OsuFont.GetFont(size: text_size),
+                                    Font = OsuFont.GetFont(size: font_size),
                                     Text = @"Sort by"
                                 },
                                 new SortSelector
@@ -107,7 +105,7 @@ namespace osu.Game.Overlays.Comments
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Font = OsuFont.GetFont(size: text_size),
+                            Font = OsuFont.GetFont(size: font_size),
                             Text = @"Show deleted"
                         }
                     },
diff --git a/osu.Game/Overlays/Comments/HeaderButton.cs b/osu.Game/Overlays/Comments/HeaderButton.cs
index 231a364759..8789cf5830 100644
--- a/osu.Game/Overlays/Comments/HeaderButton.cs
+++ b/osu.Game/Overlays/Comments/HeaderButton.cs
@@ -13,10 +13,7 @@ namespace osu.Game.Overlays.Comments
 {
     public class HeaderButton : Container
     {
-        private const int height = 20;
-        private const int corner_radius = 3;
-        private const int margin = 10;
-        private const int duration = 200;
+        private const int transition_duration = 200;
 
         protected override Container<Drawable> Content => content;
 
@@ -26,9 +23,9 @@ namespace osu.Game.Overlays.Comments
         public HeaderButton()
         {
             AutoSizeAxes = Axes.X;
-            Height = height;
+            Height = 20;
             Masking = true;
-            CornerRadius = corner_radius;
+            CornerRadius = 3;
             AddRangeInternal(new Drawable[]
             {
                 background = new Box
@@ -41,7 +38,7 @@ namespace osu.Game.Overlays.Comments
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Margin = new MarginPadding { Horizontal = margin }
+                    Margin = new MarginPadding { Horizontal = 10 }
                 },
                 new HoverClickSounds(),
             });
@@ -55,18 +52,18 @@ namespace osu.Game.Overlays.Comments
 
         protected override bool OnHover(HoverEvent e)
         {
-            FadeInBackground();
+            ShowBackground();
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
             base.OnHoverLost(e);
-            FadeOutBackground();
+            HideBackground();
         }
 
-        protected void FadeInBackground() => background.FadeIn(duration, Easing.OutQuint);
+        protected void ShowBackground() => background.FadeIn(transition_duration, Easing.OutQuint);
 
-        protected void FadeOutBackground() => background.FadeOut(duration, Easing.OutQuint);
+        protected void HideBackground() => background.FadeOut(transition_duration, Easing.OutQuint);
     }
 }
diff --git a/osu.Game/Overlays/Comments/SortSelector.cs b/osu.Game/Overlays/Comments/SortSelector.cs
index 100ae83291..90e7defb9a 100644
--- a/osu.Game/Overlays/Comments/SortSelector.cs
+++ b/osu.Game/Overlays/Comments/SortSelector.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Overlays.Comments
 
                 public void Activate()
                 {
-                    FadeInBackground();
+                    ShowBackground();
                     text.Font = text.Font.With(weight: FontWeight.Bold);
                     text.Colour = colours.BlueLighter;
                 }
@@ -83,7 +83,7 @@ namespace osu.Game.Overlays.Comments
                 public void Deactivate()
                 {
                     if (!IsHovered)
-                        FadeOutBackground();
+                        HideBackground();
 
                     text.Font = text.Font.With(weight: FontWeight.Medium);
                     text.Colour = Color4.White;