diff --git a/OpenRA.Game/Graphics/SpriteLoader.cs b/OpenRA.Game/Graphics/SpriteLoader.cs
index 186e9addb7..12d6ddd374 100644
--- a/OpenRA.Game/Graphics/SpriteLoader.cs
+++ b/OpenRA.Game/Graphics/SpriteLoader.cs
@@ -9,7 +9,7 @@
  */
 #endregion
 
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
diff --git a/OpenRA.Game/Graphics/SpriteRenderer.cs b/OpenRA.Game/Graphics/SpriteRenderer.cs
index 9cbb16d608..ddd8801488 100644
--- a/OpenRA.Game/Graphics/SpriteRenderer.cs
+++ b/OpenRA.Game/Graphics/SpriteRenderer.cs
@@ -77,9 +77,9 @@ namespace OpenRA.Graphics
 				for (; secondarySheetIndex < ns; secondarySheetIndex++)
 					if (sheets[secondarySheetIndex] == secondarySheet)
 						break;
-			}
-
-			// Make sure that we have enough free samplers to map both if needed, otherwise flush
+			}
+
+			// Make sure that we have enough free samplers to map both if needed, otherwise flush
 			var needSamplers = (sheetIndex == ns ? 1 : 0) + (secondarySheetIndex == ns ? 1 : 0);
 			if (ns + needSamplers >= sheets.Length)
 			{
diff --git a/OpenRA.Game/Graphics/Util.cs b/OpenRA.Game/Graphics/Util.cs
index 45d6365960..1429e7b541 100644
--- a/OpenRA.Game/Graphics/Util.cs
+++ b/OpenRA.Game/Graphics/Util.cs
@@ -44,8 +44,8 @@ namespace OpenRA.Graphics
 				sl = ss.SecondaryLeft;
 				st = ss.SecondaryTop;
 				sr = ss.SecondaryRight;
-				sb = ss.SecondaryBottom;
-
+				sb = ss.SecondaryBottom;
+
 				attribC |= ((byte)ss.SecondaryChannel) << 4 | 0x08;
 				attribC |= samplers.Y << 9;
 			}
diff --git a/OpenRA.Game/Network/GameServer.cs b/OpenRA.Game/Network/GameServer.cs
index 4572efd2cb..e423bcc9f6 100644
--- a/OpenRA.Game/Network/GameServer.cs
+++ b/OpenRA.Game/Network/GameServer.cs
@@ -174,26 +174,26 @@ namespace OpenRA.Network
 			if (string.IsNullOrEmpty(ModTitle))
 			{
 				Manifest mod;
-
+
 				if (external != null && external.Version == Version)
 				{
 					// Use external mod registration to populate the section header
 					ModTitle = external.Title;
 				}
 				else if (Game.Mods.TryGetValue(Mod, out mod))
-				{
-					// Use internal mod data to populate the section header, but
-					// on-connect switching must use the external mod plumbing.
-					ModTitle = mod.Metadata.Title;
+				{
+					// Use internal mod data to populate the section header, but
+					// on-connect switching must use the external mod plumbing.
+					ModTitle = mod.Metadata.Title;
 				}
 				else
-				{
-					// Some platforms (e.g. macOS) package each mod separately, so the Mods check above won't work.
-					// Guess based on the most recent ExternalMod instead.
+				{
+					// Some platforms (e.g. macOS) package each mod separately, so the Mods check above won't work.
+					// Guess based on the most recent ExternalMod instead.
 					var guessMod = Game.ExternalMods.Values
 						.OrderByDescending(m => m.Version)
-						.FirstOrDefault(m => m.Id == Mod);
-
+						.FirstOrDefault(m => m.Id == Mod);
+
 					if (guessMod != null)
 						ModTitle = "{0}".F(guessMod.Title);
 					else
diff --git a/OpenRA.Game/Server/ServerOrder.cs b/OpenRA.Game/Server/ServerOrder.cs
index cc6d26d69a..d46f80b852 100644
--- a/OpenRA.Game/Server/ServerOrder.cs
+++ b/OpenRA.Game/Server/ServerOrder.cs
@@ -30,7 +30,7 @@ namespace OpenRA.Server
 			byte b;
 			switch (b = r.ReadByte())
 			{
-				case 0xbf:
+				case 0xbf:
 					// Silently ignore disconnect notifications
 					return null;
 				case 0xff:
diff --git a/OpenRA.Game/World.cs b/OpenRA.Game/World.cs
index 58641d327b..b6328fb9f1 100644
--- a/OpenRA.Game/World.cs
+++ b/OpenRA.Game/World.cs
@@ -420,9 +420,9 @@ namespace OpenRA
 					ret += n++ * Sync.Hash(sync);
 
 				// Hash the shared random number generator.
-				ret += SharedRandom.Last;
-
-				// Hash player RenderPlayer status
+				ret += SharedRandom.Last;
+
+				// Hash player RenderPlayer status
 				foreach (var p in Players)
 					if (p.UnlockedRenderPlayer)
 						ret += Sync.HashPlayer(p);
diff --git a/OpenRA.Mods.Common/Activities/Rearm.cs b/OpenRA.Mods.Common/Activities/Rearm.cs
index 503a8e991f..418888ae8e 100644
--- a/OpenRA.Mods.Common/Activities/Rearm.cs
+++ b/OpenRA.Mods.Common/Activities/Rearm.cs
@@ -27,10 +27,10 @@ namespace OpenRA.Mods.Common.Activities
 		}
 
 		protected override void OnFirstRun(Actor self)
-		{
-			// Reset the ReloadDelay to avoid any issues with early cancellation
+		{
+			// Reset the ReloadDelay to avoid any issues with early cancellation
 			// from previous reload attempts (explicit order, host building died, etc).
-			// HACK: this really shouldn't be managed from here
+			// HACK: this really shouldn't be managed from here
 			foreach (var pool in ammoPools)
 				pool.RemainingTicks = pool.Info.ReloadDelay;
 		}
diff --git a/OpenRA.Mods.Common/SpriteLoaders/ShpTDLoader.cs b/OpenRA.Mods.Common/SpriteLoaders/ShpTDLoader.cs
index 9b4f5c1b15..0473a0516a 100644
--- a/OpenRA.Mods.Common/SpriteLoaders/ShpTDLoader.cs
+++ b/OpenRA.Mods.Common/SpriteLoaders/ShpTDLoader.cs
@@ -109,24 +109,24 @@ namespace OpenRA.Mods.Common.SpriteLoaders
 				}
 
 				var trimmedWidth = right - left + 1;
-				var trimmedHeight = bottom - top + 1;
-
-				// Pad the dimensions to an even number to avoid issues with half-integer offsets
+				var trimmedHeight = bottom - top + 1;
+
+				// Pad the dimensions to an even number to avoid issues with half-integer offsets
 				var widthFudge = trimmedWidth % 2;
 				var heightFudge = trimmedHeight % 2;
 				var destWidth = trimmedWidth + widthFudge;
-				var destHeight = trimmedHeight + heightFudge;
+				var destHeight = trimmedHeight + heightFudge;
 
 				if (trimmedWidth == origSize.Width && trimmedHeight == origSize.Height)
-				{
-					// Nothing to trim, so copy old data directly
+				{
+					// Nothing to trim, so copy old data directly
 					Size = header.Size;
 					FrameSize = header.FrameSize;
 					Offset = header.Offset;
 					Data = header.Data;
 				}
 				else if (trimmedWidth > 0 && trimmedHeight > 0)
-				{
+				{
 					// Trim frame
 					Data = new byte[destWidth * destHeight];
 					for (var y = 0; y < trimmedHeight; y++)
@@ -139,8 +139,8 @@ namespace OpenRA.Mods.Common.SpriteLoaders
 						top + bottom + heightFudge - origSize.Height + 1);
 				}
 				else
-				{
-					// Empty frame
+				{
+					// Empty frame
 					Data = new byte[0];
 				}
 			}
diff --git a/OpenRA.Mods.Common/Traits/CashTrickler.cs b/OpenRA.Mods.Common/Traits/CashTrickler.cs
index cd3a4b380e..dd034d47aa 100644
--- a/OpenRA.Mods.Common/Traits/CashTrickler.cs
+++ b/OpenRA.Mods.Common/Traits/CashTrickler.cs
@@ -86,7 +86,7 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			amount = resources.ChangeCash(amount);
 
-			if (info.ShowTicks && amount != 0)
+			if (info.ShowTicks && amount != 0)
 				AddCashTick(self, amount);
 		}
 	}
diff --git a/OpenRA.Mods.Common/Traits/GivesCashOnCapture.cs b/OpenRA.Mods.Common/Traits/GivesCashOnCapture.cs
index 2cdd8fd4e7..2ac3999379 100644
--- a/OpenRA.Mods.Common/Traits/GivesCashOnCapture.cs
+++ b/OpenRA.Mods.Common/Traits/GivesCashOnCapture.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Traits
 
 			var resources = newOwner.PlayerActor.Trait<PlayerResources>();
 
-			var amount = resources.ChangeCash(info.Amount);
+			var amount = resources.ChangeCash(info.Amount);
 
 			if (!info.ShowTicks && amount != 0)
 				return;
diff --git a/OpenRA.Mods.Common/Traits/Player/PlayerResources.cs b/OpenRA.Mods.Common/Traits/Player/PlayerResources.cs
index e545b97585..5f288e500e 100644
--- a/OpenRA.Mods.Common/Traits/Player/PlayerResources.cs
+++ b/OpenRA.Mods.Common/Traits/Player/PlayerResources.cs
@@ -88,16 +88,16 @@ namespace OpenRA.Mods.Common.Traits
 
 		public int ChangeCash(int amount)
 		{
-			if (amount >= 0)
+			if (amount >= 0)
 				GiveCash(amount);
-			else
+			else
 			{
-				// Don't put the player into negative funds
+				// Don't put the player into negative funds
 				amount = Math.Max(-(Cash + Resources), amount);
-
-				TakeCash(-amount);
-			}
-
+
+				TakeCash(-amount);
+			}
+
 			return amount;
 		}
 
diff --git a/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
index 3981a18a6e..f95935899c 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
@@ -200,10 +200,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			color.AttachPanel(colorChooser, onExit);
 		}
 
-		public override void Tick()
-		{
+		public override void Tick()
+		{
 			if (paletteTabHighlighted > 0)
-				paletteTabHighlighted--;
+				paletteTabHighlighted--;
 		}
 	}
 }
diff --git a/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs
index bdb36d339d..ac3b96be50 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs
@@ -12,7 +12,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.Common.Widgets.Logic
@@ -59,9 +59,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			{
 				var modCredits = modData.Manifest.Get<ModCredits>();
 				modLines = ParseLines(modCredits.ModCreditsFile);
-				modTab.GetText = () => modCredits.ModTabTitle;
-
-				// Make space to show the tabs
+				modTab.GetText = () => modCredits.ModTabTitle;
+
+				// Make space to show the tabs
 				tabContainer.IsVisible = () => true;
 				scrollPanel.Bounds.Y += tabContainer.Bounds.Height;
 				scrollPanel.Bounds.Height -= tabContainer.Bounds.Height;
diff --git a/OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs
index 3a03d3c302..2603cf7971 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs
@@ -9,7 +9,7 @@
  */
 #endregion
 
-using System.Diagnostics;
+using System.Diagnostics;
 using OpenRA.Support;
 using OpenRA.Widgets;
 
diff --git a/OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs b/OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs
index 7ccd8aa667..7d76fc8ac9 100644
--- a/OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs
@@ -200,7 +200,7 @@ namespace OpenRA.Mods.Common.Widgets
 					continue;
 
 				if (!flashed && !o.SuppressVisualFeedback)
-				{
+				{
 					var visualTarget = o.VisualFeedbackTarget.Type != TargetType.Invalid ? o.VisualFeedbackTarget : o.Target;
 					if (visualTarget.Type == TargetType.Actor)
 					{