Index: binary-improvements2/7dtd-server-fixes/src/PersistentData/Attributes.cs
===================================================================
--- binary-improvements2/7dtd-server-fixes/src/PersistentData/Attributes.cs	(revision 383)
+++ binary-improvements2/7dtd-server-fixes/src/PersistentData/Attributes.cs	(revision 391)
@@ -8,17 +8,11 @@
 
 		public bool HideChatCommands {
-			get { return hideChatCommands; }
-			set { hideChatCommands = value; }
+			get => hideChatCommands;
+			set => hideChatCommands = value;
 		}
 
 		public string HideChatCommandPrefix {
-			get {
-				if (hideChatCommandPrefix == null) {
-					hideChatCommandPrefix = "";
-				}
-
-				return hideChatCommandPrefix;
-			}
-			set { hideChatCommandPrefix = value; }
+			get => hideChatCommandPrefix ?? (hideChatCommandPrefix = "");
+			set => hideChatCommandPrefix = value;
 		}
 	}
Index: binary-improvements2/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs
===================================================================
--- binary-improvements2/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs	(revision 383)
+++ binary-improvements2/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs	(revision 391)
@@ -10,35 +10,11 @@
 		[OptionalField] private Attributes attributes;
 
-		public Players Players {
-			get {
-				if (players == null) {
-					players = new Players ();
-				}
+		public Players Players => players ?? (players = new Players ());
 
-				return players;
-			}
-		}
-
-		public Attributes Attributes {
-			get {
-				if (attributes == null) {
-					attributes = new Attributes ();
-				}
-
-				return attributes;
-			}
-		}
+		public Attributes Attributes => attributes ?? (attributes = new Attributes ());
 
 		private static PersistentContainer instance;
 
-		public static PersistentContainer Instance {
-			get {
-				if (instance == null) {
-					instance = new PersistentContainer ();
-				}
-
-				return instance;
-			}
-		}
+		public static PersistentContainer Instance => instance ?? (instance = new PersistentContainer ());
 
 		private PersistentContainer () {
@@ -58,8 +34,7 @@
 
 			try {
-				PersistentContainer obj;
 				Stream stream = File.Open (GameIO.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open);
 				BinaryFormatter bFormatter = new BinaryFormatter ();
-				obj = (PersistentContainer) bFormatter.Deserialize (stream);
+				PersistentContainer obj = (PersistentContainer) bFormatter.Deserialize (stream);
 				stream.Close ();
 				instance = obj;
Index: binary-improvements2/7dtd-server-fixes/src/PersistentData/Players.cs
===================================================================
--- binary-improvements2/7dtd-server-fixes/src/PersistentData/Players.cs	(revision 383)
+++ binary-improvements2/7dtd-server-fixes/src/PersistentData/Players.cs	(revision 391)
@@ -41,19 +41,19 @@
 
 			if (int.TryParse (_nameOrId, out int entityId)) {
-				foreach (KeyValuePair<PlatformUserIdentifierAbs, Player> kvp in Dict) {
-					if (kvp.Value.IsOnline && kvp.Value.EntityID == entityId) {
-						return kvp.Key;
+				foreach ((PlatformUserIdentifierAbs iUserId, Player player) in Dict) {
+					if (player.IsOnline && player.EntityID == entityId) {
+						return iUserId;
 					}
 				}
 			}
 
-			foreach (KeyValuePair<PlatformUserIdentifierAbs, Player> kvp in Dict) {
-				string name = kvp.Value.Name;
+			foreach ((PlatformUserIdentifierAbs iUserId, Player player) in Dict) {
+				string name = player.Name;
 				if (_ignoreColorCodes) {
 					name = Regex.Replace (name, "\\[[0-9a-fA-F]{6}\\]", "");
 				}
 
-				if (kvp.Value.IsOnline && name.EqualsCaseInsensitive (_nameOrId)) {
-					return kvp.Key;
+				if (player.IsOnline && name.EqualsCaseInsensitive (_nameOrId)) {
+					return iUserId;
 				}
 			}