diff --git a/Source/automap.cpp b/Source/automap.cpp
index 044f8f93b..22b791995 100644
--- a/Source/automap.cpp
+++ b/Source/automap.cpp
@@ -170,7 +170,7 @@ void DrawAutomap()
 		return;
 	}
 
-	gpBufEnd = &gpBuffer[(PANEL_Y) * BUFFER_WIDTH];
+	gpBufEnd = &gpBuffer[(PANEL_Y)*BUFFER_WIDTH];
 
 	MapX = (ViewX - 16) >> 1;
 	while (MapX + AutoMapXOfs < 0)
diff --git a/Source/control.cpp b/Source/control.cpp
index 6ccc3929a..5e267dc64 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -80,39 +80,39 @@ const BYTE fontkern[68] = {
  */
 const int lineOffsets[5][5] = {
 	{
-		BUFFER_WIDTH * (434 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * 32,
-		BUFFER_WIDTH * 32,
-		BUFFER_WIDTH * 32,
-		BUFFER_WIDTH * 32 + 180,
+	    BUFFER_WIDTH * (434 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH * 32,
+	    BUFFER_WIDTH * 32,
+	    BUFFER_WIDTH * 32,
+	    BUFFER_WIDTH * 32 + 180,
 	},
 	{
-		BUFFER_WIDTH * (422 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * (446 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * 32,
-		BUFFER_WIDTH * 32,
-		BUFFER_WIDTH * 32,
+	    BUFFER_WIDTH * (422 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH *(446 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH * 32,
+	    BUFFER_WIDTH * 32,
+	    BUFFER_WIDTH * 32,
 	},
 	{
-		BUFFER_WIDTH * (416 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * (434 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * (452 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * 32,
-		BUFFER_WIDTH * 32,
+	    BUFFER_WIDTH * (416 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH *(434 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH *(452 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH * 32,
+	    BUFFER_WIDTH * 32,
 	},
 	{
-		BUFFER_WIDTH * (412 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * (427 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * (441 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * (456 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * 32,
+	    BUFFER_WIDTH * (412 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH *(427 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH *(441 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH *(456 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH * 32,
 	},
 	{
-		BUFFER_WIDTH * (410 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * (422 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * (434 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * (446 + SCREEN_Y) + 177 + SCREEN_X,
-		BUFFER_WIDTH * (457 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH * (410 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH *(422 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH *(434 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH *(446 + SCREEN_Y) + 177 + SCREEN_X,
+	    BUFFER_WIDTH *(457 + SCREEN_Y) + 177 + SCREEN_X,
 	}
 };
 const BYTE gbFontTransTbl[256] = {
@@ -2257,7 +2257,7 @@ void PrintSBookStr(int x, int y, BOOL cjustflag, char *pszStr, char col)
 	char *tmp;
 	int screen_x, line, width;
 
-	width = PitchTbl[y] + x + SCREEN_WIDTH - 320 + 120;;
+	width = PitchTbl[y] + x + SCREEN_WIDTH - 320 + 120;
 	line = 0;
 	if (cjustflag) {
 		screen_x = 0;
diff --git a/Source/engine.h b/Source/engine.h
index fb62860c5..faa424e33 100644
--- a/Source/engine.h
+++ b/Source/engine.h
@@ -5,7 +5,7 @@
 //offset 0
 //pCelBuff->pFrameTable[0]
 
-extern char gbPixelCol; // automap pixel color 8-bit (palette entry)
+extern char gbPixelCol;  // automap pixel color 8-bit (palette entry)
 extern BOOL gbRotateMap; // flip - if y < x
 extern int orgseed;
 extern int SeedCount;
diff --git a/Source/init.cpp b/Source/init.cpp
index 6261ebac5..15d047230 100644
--- a/Source/init.cpp
+++ b/Source/init.cpp
@@ -241,9 +241,9 @@ void init_archives()
 		diabdat_mpq = init_test_access(diabdat_mpq_path, "\\spawn.mpq", "DiabloSpawn", 1000, FS_PC);
 #else
 #ifdef COPYPROT
-		diabdat_mpq = init_test_access(diabdat_mpq_path, "\\diabdat.mpq", "DiabloCD", 1000, FS_CD);
+	diabdat_mpq = init_test_access(diabdat_mpq_path, "\\diabdat.mpq", "DiabloCD", 1000, FS_CD);
 #else
-		diabdat_mpq = init_test_access(diabdat_mpq_path, "\\diabdat.mpq", "DiabloCD", 1000, FS_PC);
+	diabdat_mpq = init_test_access(diabdat_mpq_path, "\\diabdat.mpq", "DiabloCD", 1000, FS_PC);
 #endif
 #endif
 #ifdef COPYPROT
diff --git a/Source/lighting.cpp b/Source/lighting.cpp
index 17eaefc67..ef1035d77 100644
--- a/Source/lighting.cpp
+++ b/Source/lighting.cpp
@@ -402,28 +402,27 @@ char CrawlTable[2749] = {
 
 // pCrawlTable maps from circle radius to the X- and Y-coordinate deltas from
 // the center of a circle.
-char *pCrawlTable[19] =
-    {
-	    CrawlTable,
-	    CrawlTable + 3,
-	    CrawlTable + 12,
-	    CrawlTable + 45,
-	    CrawlTable + 94,
-	    CrawlTable + 159,
-	    CrawlTable + 240,
-	    CrawlTable + 337,
-	    CrawlTable + 450,
-	    CrawlTable + 579,
-	    CrawlTable + 724,
-	    CrawlTable + 885,
-	    CrawlTable + 1062,
-	    CrawlTable + 1255,
-	    CrawlTable + 1464,
-	    CrawlTable + 1689,
-	    CrawlTable + 1930,
-	    CrawlTable + 2187,
-	    CrawlTable + 2460
-    };
+char *pCrawlTable[19] = {
+	CrawlTable,
+	CrawlTable + 3,
+	CrawlTable + 12,
+	CrawlTable + 45,
+	CrawlTable + 94,
+	CrawlTable + 159,
+	CrawlTable + 240,
+	CrawlTable + 337,
+	CrawlTable + 450,
+	CrawlTable + 579,
+	CrawlTable + 724,
+	CrawlTable + 885,
+	CrawlTable + 1062,
+	CrawlTable + 1255,
+	CrawlTable + 1464,
+	CrawlTable + 1689,
+	CrawlTable + 1930,
+	CrawlTable + 2187,
+	CrawlTable + 2460
+};
 BYTE vCrawlTable[23][30] = {
 	{ 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 8, 0, 9, 0, 10, 0, 11, 0, 12, 0, 13, 0, 14, 0, 15, 0 },
 	{ 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 8, 1, 9, 1, 10, 1, 11, 1, 12, 1, 13, 1, 14, 1, 15, 1 },
diff --git a/Source/missiles.cpp b/Source/missiles.cpp
index a3c0bb7d2..401c0efe7 100644
--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@@ -491,14 +491,14 @@ BOOL MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, BOOLEAN shif
 	mir = missiledata[t].mResist;
 	mor = monster[m].mMagicRes;
 	if (mor & IMUNE_MAGIC && mir == MISR_MAGIC
-	|| mor & IMUNE_FIRE && mir == MISR_FIRE
-	|| mor & IMUNE_LIGHTNING && mir == MISR_LIGHTNING) {
+	    || mor & IMUNE_FIRE && mir == MISR_FIRE
+	    || mor & IMUNE_LIGHTNING && mir == MISR_LIGHTNING) {
 		return FALSE;
 	}
 
 	if ((mor & RESIST_MAGIC && mir == MISR_MAGIC)
-	|| (mor & RESIST_FIRE && mir == MISR_FIRE)
-	|| (mor & RESIST_LIGHTNING && mir == MISR_LIGHTNING)) {
+	    || (mor & RESIST_FIRE && mir == MISR_FIRE)
+	    || (mor & RESIST_LIGHTNING && mir == MISR_LIGHTNING)) {
 		resist = TRUE;
 	}
 
diff --git a/Source/monster.cpp b/Source/monster.cpp
index 6686eb2c2..7b60aed1d 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -2835,7 +2835,7 @@ BOOL M_CallWalk2(int i, int md)
 	int mdtemp;
 
 	mdtemp = md;
-	ok = DirOK(i, md);    // Can we continue in the same direction
+	ok = DirOK(i, md);     // Can we continue in the same direction
 	if (random_(101, 2)) { // Randomly go left or right
 		ok = ok || (mdtemp = left[md], DirOK(i, left[md])) || (mdtemp = right[md], DirOK(i, right[md]));
 	} else {
diff --git a/Source/msg.cpp b/Source/msg.cpp
index 0f4387873..d381816bb 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -1848,7 +1848,7 @@ DWORD On_OPOBJT(TCmd *pCmd, int pnum)
 
 	if (gbBufferMsgs != 1 && currlevel == plr[pnum].plrlevel) {
 		plr[pnum].destAction = ACTION_OPERATETK;
-		plr[pnum].destParam1 =p->wParam1;
+		plr[pnum].destParam1 = p->wParam1;
 	}
 
 	return sizeof(*p);
diff --git a/Source/multi.cpp b/Source/multi.cpp
index 97b024ff3..acaadc35f 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -544,7 +544,7 @@ void multi_send_zero_packet(int pnum, BYTE bCmd, BYTE *pbSrc, DWORD dwLen)
 
 	dwOffset = 0;
 
-	while(dwLen != 0) {
+	while (dwLen != 0) {
 		pkt.hdr.wCheck = 'ip';
 		pkt.hdr.px = 0;
 		pkt.hdr.py = 0;
@@ -559,7 +559,7 @@ void multi_send_zero_packet(int pnum, BYTE bCmd, BYTE *pbSrc, DWORD dwLen)
 		p->bCmd = bCmd;
 		p->wOffset = dwOffset;
 		dwBody = gdwLargestMsgSize - sizeof(pkt.hdr) - sizeof(*p);
-		if(dwLen < dwBody) {
+		if (dwLen < dwBody) {
 			dwBody = dwLen;
 		}
 		/// ASSERT: assert(dwBody <= 0x0ffff);
@@ -569,7 +569,7 @@ void multi_send_zero_packet(int pnum, BYTE bCmd, BYTE *pbSrc, DWORD dwLen)
 		dwMsg += sizeof(*p);
 		dwMsg += p->wBytes;
 		pkt.hdr.wLen = dwMsg;
-		if(!SNetSendMessage(pnum, &pkt, dwMsg)) {
+		if (!SNetSendMessage(pnum, &pkt, dwMsg)) {
 			nthread_terminate_game("SNetSendMessage2");
 			return;
 		}