diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 73ce029d3f..de0f24aa90 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -808,13 +808,15 @@ namespace osu.Game.Screens.Select
 
             return false;
         }
+
         private void increaseSpeed()
         {
             var rateAdjustStates = ModSelect.AllAvailableMods.Where(pair => pair.Mod is ModRateAdjust);
             var stateDoubleTime = ModSelect.AllAvailableMods.First(pair => pair.Mod is ModDoubleTime);
-            bool rateModActive = ModSelect.AllAvailableMods.Where(pair => pair.Mod is ModRateAdjust && pair.Active.Value).Count() > 0;
-            double stepSize = 0.05d;
-            double newRate = 1d + stepSize;
+            bool rateModActive = ModSelect.AllAvailableMods.Count(pair => pair.Mod is ModRateAdjust && pair.Active.Value) > 0;
+            const double stepsize = 0.05d;
+            double newRate = 1d + stepsize;
+
             // If no mod rateAdjust mod is currently active activate DoubleTime with speed newRate
             if (!rateModActive)
             {
@@ -822,18 +824,23 @@ namespace osu.Game.Screens.Select
                 ((ModDoubleTime)stateDoubleTime.Mod).SpeedChange.Value = newRate;
                 return;
             }
+
             // Find current active rateAdjust mod and modify speed, enable DoubleTime if necessary
             foreach (var state in rateAdjustStates)
             {
                 ModRateAdjust mod = (ModRateAdjust)state.Mod;
+
                 if (!state.Active.Value) continue;
-                newRate = mod.SpeedChange.Value + stepSize;
+
+                newRate = mod.SpeedChange.Value + stepsize;
+
                 if (mod.Acronym == "DT" || mod.Acronym == "NC")
                     mod.SpeedChange.Value = newRate;
                 else
                 {
                     if (newRate == 1.0d)
                         state.Active.Value = false;
+
                     if (newRate > 1d)
                     {
                         state.Active.Value = false;
@@ -841,18 +848,21 @@ namespace osu.Game.Screens.Select
                         ((ModDoubleTime)stateDoubleTime.Mod).SpeedChange.Value = newRate;
                         break;
                     }
+
                     if (newRate < 1d)
                         mod.SpeedChange.Value = newRate;
                 }
             }
         }
+
         private void decreaseSpeed()
         {
             var rateAdjustStates = ModSelect.AllAvailableMods.Where(pair => pair.Mod is ModRateAdjust);
             var stateHalfTime = ModSelect.AllAvailableMods.First(pair => pair.Mod is ModHalfTime);
-            bool rateModActive = ModSelect.AllAvailableMods.Where(pair => pair.Mod is ModRateAdjust && pair.Active.Value).Count() > 0;
-            double stepSize = 0.05d;
-            double newRate = 1d - stepSize;
+            bool rateModActive = ModSelect.AllAvailableMods.Count(pair => pair.Mod is ModRateAdjust && pair.Active.Value) > 0;
+            const double stepsize = 0.05d;
+            double newRate = 1d - stepsize;
+
             // If no mod rateAdjust mod is currently active activate HalfTime with speed newRate
             if (!rateModActive)
             {
@@ -860,18 +870,23 @@ namespace osu.Game.Screens.Select
                 ((ModHalfTime)stateHalfTime.Mod).SpeedChange.Value = newRate;
                 return;
             }
+
             // Find current active rateAdjust mod and modify speed, enable HalfTime if necessary
             foreach (var state in rateAdjustStates)
             {
                 ModRateAdjust mod = (ModRateAdjust)state.Mod;
+
                 if (!state.Active.Value) continue;
-                newRate = mod.SpeedChange.Value - stepSize;
+
+                newRate = mod.SpeedChange.Value - stepsize;
+
                 if (mod.Acronym == "HT" || mod.Acronym == "DC")
                     mod.SpeedChange.Value = newRate;
                 else
                 {
                     if (newRate == 1.0d)
                         state.Active.Value = false;
+
                     if (newRate < 1d)
                     {
                         state.Active.Value = false;
@@ -879,11 +894,13 @@ namespace osu.Game.Screens.Select
                         ((ModHalfTime)stateHalfTime.Mod).SpeedChange.Value = newRate;
                         break;
                     }
+
                     if (newRate > 1d)
                         mod.SpeedChange.Value = newRate;
                 }
             }
         }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -1086,14 +1103,17 @@ namespace osu.Game.Screens.Select
                 return false;
 
             if (!this.IsCurrentScreen()) return false;
+
             switch (e.Action)
             {
                 case GlobalAction.Select:
                     FinaliseSelection();
                     return true;
+
                 case GlobalAction.IncreaseSpeed:
                     increaseSpeed();
                     return true;
+
                 case GlobalAction.DecreaseSpeed:
                     decreaseSpeed();
                     return true;