diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 9eb2cccc13..b01405c989 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -248,9 +248,7 @@ namespace OpenRA
 
 			Map map;
 			using (new PerfTimer("PrepareMap"))
-			{
 				map = modData.PrepareMap(mapUID);
-			}
 			using (new PerfTimer("NewWorld"))
 			{
 				orderManager.world = new World(modData.Manifest, map, orderManager, isShellmap);
@@ -258,9 +256,7 @@ namespace OpenRA
 			}
 			worldRenderer = new WorldRenderer(orderManager.world);
 			using (new PerfTimer("LoadComplete"))
-			{
 				orderManager.world.LoadComplete(worldRenderer);
-			}
 
 			if (orderManager.GameStarted)
 				return;
@@ -396,9 +392,7 @@ namespace OpenRA
 			Renderer.InitializeFonts(modData.Manifest);
 			modData.InitializeLoaders();
 			using (new PerfTimer("LoadMaps"))
-			{
 				modData.MapCache.LoadMaps();
-			}
 
 			PerfHistory.items["render"].hasNormalTick = false;
 			PerfHistory.items["batches"].hasNormalTick = false;
@@ -449,12 +443,10 @@ namespace OpenRA
 
 		public static void LoadShellMap()
 		{
-			string shellMap = ChooseShellmap();
+			var shellmap = ChooseShellmap();
 
 			using (new PerfTimer("StartGame"))
-			{
-				StartGame(shellMap, true);
-			}
+				StartGame(shellmap, true);
 		}
 
 		static string ChooseShellmap()
diff --git a/OpenRA.Game/ModData.cs b/OpenRA.Game/ModData.cs
index 0ca48529f3..6bc9db8e54 100755
--- a/OpenRA.Game/ModData.cs
+++ b/OpenRA.Game/ModData.cs
@@ -119,9 +119,7 @@ namespace OpenRA
 			GlobalFileSystem.Mount(GlobalFileSystem.OpenPackage(map.Path, null, int.MaxValue));
 
 			using (new Support.PerfTimer("LoadRules"))
-			{
 				Rules.LoadRules(Manifest, map);
-			}
 			SpriteLoader = new SpriteLoader(Rules.TileSets[map.Tileset].Extensions, SheetBuilder);
 
 			using (new Support.PerfTimer("SequenceProvider.Initialize"))
diff --git a/OpenRA.Game/Support/PerfTimer.cs b/OpenRA.Game/Support/PerfTimer.cs
index 9dc461cd5a..43ed9ba8e6 100755
--- a/OpenRA.Game/Support/PerfTimer.cs
+++ b/OpenRA.Game/Support/PerfTimer.cs
@@ -61,22 +61,22 @@ namespace OpenRA.Support
 			Log.Write("perf", FormatString, s, Math.Round(this.sw.Elapsed.TotalMilliseconds));
 		}
 
-		private static string GetHeader(string indentation, string label)
+		static string GetHeader(string indentation, string label)
 		{
 			return string.Concat(indentation, LimitLength(label, MaxIndentedLabel - indentation.Length));
 		}
 
-		private static string GetOneLiner(string indentation, string label)
+		static string GetOneLiner(string indentation, string label)
 		{
 			return string.Concat(indentation, SetLength(label, MaxIndentedLabel - indentation.Length));
 		}
 
-		private static string GetFooter(string indentation)
+		static string GetFooter(string indentation)
 		{
 			return string.Concat(indentation, new string('-', MaxIndentedLabel - indentation.Length));
 		}
 
-		private static string LimitLength(string s, int length, int minLength = 8)
+		static string LimitLength(string s, int length, int minLength = 8)
 		{
 			length = Math.Max(length, minLength);
 
@@ -86,7 +86,7 @@ namespace OpenRA.Support
 			return s.Substring(0, length);
 		}
 
-		private static string SetLength(string s, int length, int minLength = 8)
+		static string SetLength(string s, int length, int minLength = 8)
 		{
 			length = Math.Max(length, minLength);
 
@@ -99,7 +99,7 @@ namespace OpenRA.Support
 			return s.Substring(0, length);
 		}
 
-		private static string Indentation
+		static string Indentation
 		{
 			get
 			{
diff --git a/OpenRA.Lint/YamlChecker.cs b/OpenRA.Lint/YamlChecker.cs
index 979c09176e..2dfa8d1c1d 100644
--- a/OpenRA.Lint/YamlChecker.cs
+++ b/OpenRA.Lint/YamlChecker.cs
@@ -6,14 +6,12 @@
  * as published by the Free Software Foundation. For more information,
  * see COPYING.
  */
-using System.IO;
-
-
 #endregion
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.IO;
 using OpenRA.FileSystem;
 using OpenRA.Traits;