diff --git a/OpenRA.Game/Network/Session.cs b/OpenRA.Game/Network/Session.cs
index 6a90569d45..7c8bd1b632 100644
--- a/OpenRA.Game/Network/Session.cs
+++ b/OpenRA.Game/Network/Session.cs
@@ -94,10 +94,14 @@ namespace OpenRA.Network
 
 		public class Client
 		{
+			public static Client Deserialize(MiniYaml data)
+			{
+				return FieldLoader.Load<Client>(data);
+			}
+
 			public int Index;
 			public HSLColor PreferredColor; // Color that the client normally uses from settings.yaml.
-			public HSLColor Color; // Actual color that the client is using.
-								   // Usually the same as PreferredColor but can be different on maps with locked colors.
+			public HSLColor Color; // Actual color that the client is using. Usually the same as PreferredColor but can be different on maps with locked colors.
 			public string Country;
 			public int SpawnPoint;
 			public string Name;
@@ -116,11 +120,6 @@ namespace OpenRA.Network
 			{
 				return new MiniYamlNode("Client@{0}".F(this.Index), FieldSaver.Save(this));
 			}
-
-			public static Client Deserialize(MiniYaml data)
-			{
-				return FieldLoader.Load<Client>(data);
-			}
 		}
 
 		public ClientPing PingFromClient(Client client)
@@ -135,15 +134,15 @@ namespace OpenRA.Network
 			public int LatencyJitter = -1;
 			public int[] LatencyHistory = { };
 
-			public MiniYamlNode Serialize()
-			{
-				return new MiniYamlNode("ClientPing@{0}".F(this.Index), FieldSaver.Save(this));
-			}
-
 			public static ClientPing Deserialize(MiniYaml data)
 			{
 				return FieldLoader.Load<ClientPing>(data);
 			}
+
+			public MiniYamlNode Serialize()
+			{
+				return new MiniYamlNode("ClientPing@{0}".F(this.Index), FieldSaver.Save(this));
+			}
 		}
 
 		public class Slot
@@ -158,15 +157,15 @@ namespace OpenRA.Network
 			public bool LockSpawn;
 			public bool Required;
 
-			public MiniYamlNode Serialize()
-			{
-				return new MiniYamlNode("Slot@{0}".F(this.PlayerReference), FieldSaver.Save(this));
-			}
-
 			public static Slot Deserialize(MiniYaml data)
 			{
 				return FieldLoader.Load<Slot>(data);
 			}
+
+			public MiniYamlNode Serialize()
+			{
+				return new MiniYamlNode("Slot@{0}".F(this.PlayerReference), FieldSaver.Save(this));
+			}
 		}
 
 		public class Global
@@ -185,20 +184,20 @@ namespace OpenRA.Network
 			public bool Fog = true;
 			public bool AllyBuildRadius = true;
 			public int StartingCash = 5000;
-			public String TechLevel = "none";
+			public string TechLevel = "none";
 			public string StartingUnitsClass = "none";
 			public bool AllowVersionMismatch;
 			public string GameUid;
 
-			public MiniYamlNode Serialize()
-			{
-				return new MiniYamlNode("GlobalSettings", FieldSaver.Save(this));
-			}
-
 			public static Global Deserialize(MiniYaml data)
 			{
 				return FieldLoader.Load<Global>(data);
 			}
+
+			public MiniYamlNode Serialize()
+			{
+				return new MiniYamlNode("GlobalSettings", FieldSaver.Save(this));
+			}
 		}
 
 		public string Serialize()