diff --git a/osu.Game/Online/API/Requests/GetScoresRequest.cs b/osu.Game/Online/API/Requests/GetScoresRequest.cs
index b9db836898..54d656eeca 100644
--- a/osu.Game/Online/API/Requests/GetScoresRequest.cs
+++ b/osu.Game/Online/API/Requests/GetScoresRequest.cs
@@ -11,7 +11,6 @@ using osu.Game.Users;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Select.Leaderboards;
-using System.Collections.Specialized;
 using osu.Framework.IO.Network;
 
 namespace osu.Game.Online.API.Requests
diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 31e79022c3..62bd292710 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -34,9 +34,10 @@ namespace osu.Game.Screens.Select.Leaderboards
         private const double fade_duration = 200;
 
         private readonly ScrollContainer scrollContainer;
+        private readonly Container placeholderContainer;
+        private readonly FillFlowContainer placeholderFlow;
+
         private FillFlowContainer<LeaderboardScore> scrollFlow;
-        private Container placeholderContainer;
-        private FillFlowContainer placeholderFlow;
 
         public Action<Score> ScoreSelected;
 
@@ -63,7 +64,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                 if (scores == null)
                     return;
 
-                if (scores.Count() == 0)
+                if (!scores.Any())
                 {
                     placeholderFlow.Children = new Drawable[]
                     {
@@ -278,7 +279,7 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         private class RetryButton : BeatSyncedContainer
         {
-            private SpriteIcon icon;
+            private readonly SpriteIcon icon;
 
             public Action Action;