diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index a30a3c4254..0c61491f9d 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -88,7 +88,6 @@ namespace osu.Game.Online.Leaderboards
                 AutoSizeAxes = Axes.Y,
                 Spacing = new Vector2(0f, 5f),
                 Padding = new MarginPadding { Top = 10, Bottom = 5 },
-
             };
 
         private TScope scope;
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTag.cs b/osu.Game/Online/Multiplayer/GameTypes/GameTypeTag.cs
index d31439f0fe..c9d16662ba 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTag.cs
+++ b/osu.Game/Online/Multiplayer/GameTypes/GameTypeTag.cs
@@ -1,3 +1,6 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osuTK;
@@ -21,4 +24,4 @@ namespace osu.Game.Online.Multiplayer.GameTypes
             };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTagTeam.cs b/osu.Game/Online/Multiplayer/GameTypes/GameTypeTagTeam.cs
index 74c8e76b46..952d1a39ac 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTagTeam.cs
+++ b/osu.Game/Online/Multiplayer/GameTypes/GameTypeTagTeam.cs
@@ -1,3 +1,6 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
@@ -38,4 +41,4 @@ namespace osu.Game.Online.Multiplayer.GameTypes
             };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTeamVersus.cs b/osu.Game/Online/Multiplayer/GameTypes/GameTypeTeamVersus.cs
index 74c2c00c3b..49e7cef88d 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTeamVersus.cs
+++ b/osu.Game/Online/Multiplayer/GameTypes/GameTypeTeamVersus.cs
@@ -1,3 +1,6 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
@@ -26,4 +29,4 @@ namespace osu.Game.Online.Multiplayer.GameTypes
             };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs b/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
index e87f8a9696..ab8658dfb2 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
+++ b/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
@@ -1,3 +1,6 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osuTK;
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeVersus.cs b/osu.Game/Online/Multiplayer/GameTypes/GameTypeVersus.cs
index b6d832490f..c74ce63470 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeVersus.cs
+++ b/osu.Game/Online/Multiplayer/GameTypes/GameTypeVersus.cs
@@ -1,3 +1,6 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 
@@ -16,4 +19,4 @@ namespace osu.Game.Online.Multiplayer.GameTypes
             };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Online/Multiplayer/GameTypes/VersusRow.cs b/osu.Game/Online/Multiplayer/GameTypes/VersusRow.cs
index 2b150fc6f0..b4d8279d02 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/VersusRow.cs
+++ b/osu.Game/Online/Multiplayer/GameTypes/VersusRow.cs
@@ -1,3 +1,6 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -49,4 +52,4 @@ namespace osu.Game.Online.Multiplayer.GameTypes
             };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 5cf73b5617..0d6a8ae3a8 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -50,7 +50,6 @@ namespace osu.Game.Online.Multiplayer
         [JsonIgnore]
         public Bindable<IEnumerable<User>> Participants { get; private set; } = new Bindable<IEnumerable<User>>(Enumerable.Empty<User>());
 
-
         public Bindable<int> ParticipantCount { get; private set; } = new Bindable<int>();
 
         // todo: TEMPORARY
diff --git a/osu.Game/Screens/Multi/Match/Components/HostInfo.cs b/osu.Game/Screens/Multi/Match/Components/HostInfo.cs
index 437b4cfe1b..993dccce44 100644
--- a/osu.Game/Screens/Multi/Match/Components/HostInfo.cs
+++ b/osu.Game/Screens/Multi/Match/Components/HostInfo.cs
@@ -42,8 +42,6 @@ namespace osu.Game.Screens.Multi.Match.Components
                 }
             };
 
-
-
             Host.BindValueChanged(updateHost);
         }
 
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index dd5a73817f..864191105f 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -4,13 +4,11 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Game.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
@@ -57,27 +55,6 @@ namespace osu.Game.Screens.Multi.Match.Components
         protected override LeaderboardScore CreateDrawableScore(APIRoomScoreInfo model, int index) => new MatchLeaderboardScore(model, index);
     }
 
-    public class MatchLeaderboardScore : LeaderboardScore
-    {
-        public MatchLeaderboardScore(APIRoomScoreInfo score, int rank)
-            : base(score, rank)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            RankContainer.Alpha = 0;
-        }
-
-        protected override IEnumerable<LeaderboardScoreStatistic> GetStatistics(ScoreInfo model) => new[]
-        {
-            new LeaderboardScoreStatistic(FontAwesome.fa_crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:P0}" : @"{0:P2}", model.Accuracy)),
-            new LeaderboardScoreStatistic(FontAwesome.fa_refresh, "Total Attempts", ((APIRoomScoreInfo)model).TotalAttempts.ToString()),
-            new LeaderboardScoreStatistic(FontAwesome.fa_check, "Completed Beatmaps", ((APIRoomScoreInfo)model).CompletedBeatmaps.ToString()),
-        };
-    }
-
     public enum MatchLeaderboardScope
     {
         Overall
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
new file mode 100644
index 0000000000..ebd69b24fc
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
@@ -0,0 +1,33 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Leaderboards;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.Multi.Match.Components
+{
+    public class MatchLeaderboardScore : LeaderboardScore
+    {
+        public MatchLeaderboardScore(APIRoomScoreInfo score, int rank)
+            : base(score, rank)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RankContainer.Alpha = 0;
+        }
+
+        protected override IEnumerable<LeaderboardScoreStatistic> GetStatistics(ScoreInfo model) => new[]
+        {
+            new LeaderboardScoreStatistic(FontAwesome.fa_crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:P0}" : @"{0:P2}", model.Accuracy)),
+            new LeaderboardScoreStatistic(FontAwesome.fa_refresh, "Total Attempts", ((APIRoomScoreInfo)model).TotalAttempts.ToString()),
+            new LeaderboardScoreStatistic(FontAwesome.fa_check, "Completed Beatmaps", ((APIRoomScoreInfo)model).CompletedBeatmaps.ToString()),
+        };
+    }
+}
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 5d16f0f8cd..1210b9379f 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -294,7 +294,6 @@ namespace osu.Game.Screens.Multi.Match.Components
 
             bindings.Duration.Value = DurationField.Current.Value;
 
-
             manager?.CreateRoom(room, onSuccess, onError);
 
             processingOverlay.Show();
diff --git a/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs b/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
index 8423a76a36..3673944837 100644
--- a/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
+++ b/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
@@ -132,7 +132,6 @@ namespace osu.Game.Screens.Multi.Ranking.Pages
                 private void load()
                 {
                 }
-
             }
         }
     }
diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index ceecaf5443..6810fdebe9 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Screens.Multi
             TimeBetweenPolls = 5000;
         }
 
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);