diff --git a/Source/control.cpp b/Source/control.cpp
index 71ef87252..632f9e27a 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -1604,71 +1604,56 @@ void __cdecl CheckBtnUp()
 
 void __cdecl FreeControlPan()
 {
-	void *v0;  // ecx
-	void *v1;  // ecx
-	void *v2;  // ecx
-	void *v3;  // ecx
-	void *v4;  // ecx
-	void *v5;  // ecx
-	void *v6;  // ecx
-	void *v7;  // ecx
-	void *v8;  // ecx
-	void *v9;  // ecx
-	void *v10; // ecx
-	void *v11; // ecx
-	void *v12; // ecx
-	void *v13; // ecx
-	void *v14; // ecx
-	void *v15; // ecx
-
-	v0 = pBtmBuff;
-	pBtmBuff = 0;
-	mem_free_dbg(v0);
-	v1 = pManaBuff;
-	pManaBuff = 0;
-	mem_free_dbg(v1);
-	v2 = pLifeBuff;
-	pLifeBuff = 0;
-	mem_free_dbg(v2);
-	v3 = pPanelText;
-	pPanelText = 0;
-	mem_free_dbg(v3);
-	v4 = pChrPanel;
-	pChrPanel = 0;
-	mem_free_dbg(v4);
-	v5 = pSpellCels;
-	pSpellCels = 0;
-	mem_free_dbg(v5);
-	v6 = pPanelButtons;
-	pPanelButtons = 0;
-	mem_free_dbg(v6);
-	v7 = pMultiBtns;
-	pMultiBtns = 0;
-	mem_free_dbg(v7);
-	v8 = pTalkBtns;
-	pTalkBtns = 0;
-	mem_free_dbg(v8);
-	v9 = pChrButtons;
-	pChrButtons = 0;
-	mem_free_dbg(v9);
-	v10 = pDurIcons;
-	pDurIcons = 0;
-	mem_free_dbg(v10);
-	v11 = pQLogCel;
-	pQLogCel = 0;
-	mem_free_dbg(v11);
-	v12 = pSpellBkCel;
-	pSpellBkCel = 0;
-	mem_free_dbg(v12);
-	v13 = pSBkBtnCel;
-	pSBkBtnCel = 0;
-	mem_free_dbg(v13);
-	v14 = pSBkIconCels;
-	pSBkIconCels = 0;
-	mem_free_dbg(v14);
-	v15 = pGBoxBuff;
-	pGBoxBuff = 0;
-	mem_free_dbg(v15);
+	void *ptr;
+
+	ptr = pBtmBuff;
+	pBtmBuff = NULL;
+	mem_free_dbg(ptr);
+	ptr = pManaBuff;
+	pManaBuff = NULL;
+	mem_free_dbg(ptr);
+	ptr = pLifeBuff;
+	pLifeBuff = NULL;
+	mem_free_dbg(ptr);
+	ptr = pPanelText;
+	pPanelText = NULL;
+	mem_free_dbg(ptr);
+	ptr = pChrPanel;
+	pChrPanel = NULL;
+	mem_free_dbg(ptr);
+	ptr = pSpellCels;
+	pSpellCels = NULL;
+	mem_free_dbg(ptr);
+	ptr = pPanelButtons;
+	pPanelButtons = NULL;
+	mem_free_dbg(ptr);
+	ptr = pMultiBtns;
+	pMultiBtns = NULL;
+	mem_free_dbg(ptr);
+	ptr = pTalkBtns;
+	pTalkBtns = NULL;
+	mem_free_dbg(ptr);
+	ptr = pChrButtons;
+	pChrButtons = NULL;
+	mem_free_dbg(ptr);
+	ptr = pDurIcons;
+	pDurIcons = NULL;
+	mem_free_dbg(ptr);
+	ptr = pQLogCel;
+	pQLogCel = NULL;
+	mem_free_dbg(ptr);
+	ptr = pSpellBkCel;
+	pSpellBkCel = NULL;
+	mem_free_dbg(ptr);
+	ptr = pSBkBtnCel;
+	pSBkBtnCel = NULL;
+	mem_free_dbg(ptr);
+	ptr = pSBkIconCels;
+	pSBkIconCels = NULL;
+	mem_free_dbg(ptr);
+	ptr = pGBoxBuff;
+	pGBoxBuff = NULL;
+	mem_free_dbg(ptr);
 }
 
 int __fastcall control_WriteStringToBuffer(char *str)
diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp
index 4fe2110c6..766ec40f6 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/drlg_l1.cpp
@@ -472,11 +472,11 @@ void __cdecl DRLG_LoadL1SP()
 
 void __cdecl DRLG_FreeL1SP()
 {
-	void *v0; // ecx
+	void *ptr;
 
-	v0 = pSetPiece;
-	pSetPiece = 0;
-	mem_free_dbg(v0);
+	ptr = pSetPiece;
+	pSetPiece = NULL;
+	mem_free_dbg(ptr);
 }
 
 void __fastcall DRLG_L5(int entry)
diff --git a/Source/drlg_l2.cpp b/Source/drlg_l2.cpp
index c1324c892..6eb128e1b 100644
--- a/Source/drlg_l2.cpp
+++ b/Source/drlg_l2.cpp
@@ -756,11 +756,11 @@ void __cdecl DRLG_LoadL2SP()
 
 void __cdecl DRLG_FreeL2SP()
 {
-	char *v0; // ecx
+	char *ptr;
 
-	v0 = pSetPiece_2;
-	pSetPiece_2 = 0;
-	mem_free_dbg(v0);
+	ptr = pSetPiece_2;
+	pSetPiece_2 = NULL;
+	mem_free_dbg(ptr);
 }
 
 void __fastcall DRLG_L2(int entry)
@@ -1857,19 +1857,21 @@ void __fastcall AddHall(int nX1, int nY1, int nX2, int nY2, int nHd)
 
 void __fastcall GetHall(int *nX1, int *nY1, int *nX2, int *nY2, int *nHd)
 {
-	HALLNODE *v5; // esi
-	HALLNODE *v6; // ecx
+	HALLNODE *p1;
+	HALLNODE *p2;
 
-	v5 = pHallList->pNext;
+	p1 = pHallList->pNext;
 	*nX1 = pHallList->nHallx1;
 	*nY1 = pHallList->nHally1;
 	*nX2 = pHallList->nHallx2;
 	*nY2 = pHallList->nHally2;
 	*nHd = pHallList->nHalldir;
-	v6 = pHallList;
-	pHallList = 0;
-	mem_free_dbg(v6);
-	pHallList = v5;
+
+	p2 = pHallList;
+	pHallList = NULL;
+	mem_free_dbg(p2);
+
+	pHallList = p1;
 }
 
 void __fastcall ConnectHall(int nX1, int nY1, int nX2, int nY2, int nHd)
diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp
index e2c1264da..ab88f182f 100644
--- a/Source/drlg_l4.cpp
+++ b/Source/drlg_l4.cpp
@@ -306,11 +306,11 @@ void __cdecl DRLG_LoadL4SP()
 
 void __cdecl DRLG_FreeL4SP()
 {
-	char *v0; // ecx
+	char *ptr;
 
-	v0 = pSetPiece_2;
-	pSetPiece_2 = 0;
-	mem_free_dbg(v0);
+	ptr = pSetPiece_2;
+	pSetPiece_2 = NULL;
+	mem_free_dbg(ptr);
 }
 
 void __fastcall DRLG_L4SetSPRoom(int rx1, int ry1)
@@ -440,47 +440,42 @@ void __fastcall DRLG_L4SetRoom(unsigned char *pSetPiece, int rx1, int ry1)
 	}
 }
 
-void __fastcall DRLG_LoadDiabQuads(BOOLEAN preflag)
+void __fastcall DRLG_LoadDiabQuads(BOOL preflag)
 {
-	BOOLEAN v1;        // esi
-	unsigned char *v2; // edi
-	char *v3;          // ecx
-	unsigned char *v4; // edi
-	char *v5;          // ecx
-	unsigned char *v6; // edi
-	char *v7;          // ecx
-	unsigned char *v8; // esi
-
-	v1 = preflag;
-	v2 = LoadFileInMem("Levels\\L4Data\\diab1.DUN", 0);
+	BYTE *dun;
+
+	dun = LoadFileInMem("Levels\\L4Data\\diab1.DUN", 0);
 	diabquad1x = l4holdx + 4;
 	diabquad1y = l4holdy + 4;
-	DRLG_L4SetRoom(v2, l4holdx + 4, l4holdy + 4);
-	mem_free_dbg(v2);
-	v3 = "Levels\\L4Data\\diab2b.DUN";
-	if (!v1)
-		v3 = "Levels\\L4Data\\diab2a.DUN";
-	v4 = LoadFileInMem(v3, 0);
-	diabquad2y = l4holdy + 1;
+	DRLG_L4SetRoom(dun, diabquad1x, diabquad1y);
+	mem_free_dbg(dun);
+
+	if (!preflag)
+		dun = LoadFileInMem("Levels\\L4Data\\diab2a.DUN", 0);
+	else
+		dun = LoadFileInMem("Levels\\L4Data\\diab2b.DUN", 0);
 	diabquad2x = 27 - l4holdx;
-	DRLG_L4SetRoom(v4, 27 - l4holdx, l4holdy + 1);
-	mem_free_dbg(v4);
-	v5 = "Levels\\L4Data\\diab3b.DUN";
-	if (!v1)
-		v5 = "Levels\\L4Data\\diab3a.DUN";
-	v6 = LoadFileInMem(v5, 0);
+	diabquad2y = l4holdy + 1;
+	DRLG_L4SetRoom(dun, diabquad2x, diabquad2y);
+	mem_free_dbg(dun);
+
+	if (!preflag)
+		dun = LoadFileInMem("Levels\\L4Data\\diab3a.DUN", 0);
+	else
+		dun = LoadFileInMem("Levels\\L4Data\\diab3b.DUN", 0);
 	diabquad3x = l4holdx + 1;
 	diabquad3y = 27 - l4holdy;
-	DRLG_L4SetRoom(v6, l4holdx + 1, 27 - l4holdy);
-	mem_free_dbg(v6);
-	v7 = "Levels\\L4Data\\diab4b.DUN";
-	if (!v1)
-		v7 = "Levels\\L4Data\\diab4a.DUN";
-	v8 = LoadFileInMem(v7, 0);
-	diabquad4y = 28 - l4holdy;
+	DRLG_L4SetRoom(dun, diabquad3x, diabquad3y);
+	mem_free_dbg(dun);
+
+	if (!preflag)
+		dun = LoadFileInMem("Levels\\L4Data\\diab4a.DUN", 0);
+	else
+		dun = LoadFileInMem("Levels\\L4Data\\diab4b.DUN", 0);
 	diabquad4x = 28 - l4holdx;
-	DRLG_L4SetRoom(v8, 28 - l4holdx, 28 - l4holdy);
-	mem_free_dbg(v8);
+	diabquad4y = 28 - l4holdy;
+	DRLG_L4SetRoom(dun, diabquad4x, diabquad4y);
+	mem_free_dbg(dun);
 }
 // 5289C4: using guessed type int diabquad1x;
 // 5289C8: using guessed type int diabquad1y;
diff --git a/Source/drlg_l4.h b/Source/drlg_l4.h
index 6679a31a7..34b9ac7c2 100644
--- a/Source/drlg_l4.h
+++ b/Source/drlg_l4.h
@@ -26,7 +26,7 @@ void __cdecl DRLG_FreeL4SP();
 void __fastcall DRLG_L4SetSPRoom(int rx1, int ry1);
 void __cdecl L4SaveQuads();
 void __fastcall DRLG_L4SetRoom(unsigned char *pSetPiece, int rx1, int ry1);
-void __fastcall DRLG_LoadDiabQuads(BOOLEAN preflag);
+void __fastcall DRLG_LoadDiabQuads(BOOL preflag);
 BOOLEAN __fastcall IsDURWall(char d);
 BOOLEAN __fastcall IsDLLWall(char dd);
 void __cdecl L4FixRim();
diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp
index 09cb8bc7f..aa0da2b0d 100644
--- a/Source/gmenu.cpp
+++ b/Source/gmenu.cpp
@@ -72,27 +72,23 @@ void __fastcall gmenu_print_text(int x, int y, char *pszStr)
 
 void __cdecl FreeGMenu()
 {
-	void *v0; // ecx
-	void *v1; // ecx
-	void *v2; // ecx
-	void *v3; // ecx
-	void *v4; // ecx
-
-	v0 = sgpLogo;
-	sgpLogo = 0;
-	mem_free_dbg(v0);
-	v1 = BigTGold_cel;
-	BigTGold_cel = 0;
-	mem_free_dbg(v1);
-	v2 = PentSpin_cel;
-	PentSpin_cel = 0;
-	mem_free_dbg(v2);
-	v3 = option_cel;
-	option_cel = 0;
-	mem_free_dbg(v3);
-	v4 = optbar_cel;
-	optbar_cel = 0;
-	mem_free_dbg(v4);
+	void *ptr;
+
+	ptr = sgpLogo;
+	sgpLogo = NULL;
+	mem_free_dbg(ptr);
+	ptr = BigTGold_cel;
+	BigTGold_cel = NULL;
+	mem_free_dbg(ptr);
+	ptr = PentSpin_cel;
+	PentSpin_cel = NULL;
+	mem_free_dbg(ptr);
+	ptr = option_cel;
+	option_cel = NULL;
+	mem_free_dbg(ptr);
+	ptr = optbar_cel;
+	optbar_cel = NULL;
+	mem_free_dbg(ptr);
 }
 
 void __cdecl gmenu_init_menu()
diff --git a/Source/interfac.cpp b/Source/interfac.cpp
index 5403879bb..721a826a0 100644
--- a/Source/interfac.cpp
+++ b/Source/interfac.cpp
@@ -223,11 +223,11 @@ void __fastcall ShowProgress(unsigned int uMsg)
 
 void __cdecl FreeInterface()
 {
-	void *v0; // ecx
+	void *ptr;
 
-	v0 = sgpBackCel;
-	sgpBackCel = 0;
-	mem_free_dbg(v0);
+	ptr = sgpBackCel;
+	sgpBackCel = NULL;
+	mem_free_dbg(ptr);
 }
 
 void __fastcall InitCutscene(unsigned int uMsg)
diff --git a/Source/lighting.cpp b/Source/lighting.cpp
index e0d77cc54..bc02e1223 100644
--- a/Source/lighting.cpp
+++ b/Source/lighting.cpp
@@ -940,11 +940,11 @@ void __fastcall DoVision(int nXPos, int nYPos, int nRadius, unsigned char doauto
 
 void __cdecl FreeLightTable()
 {
-	char *v0; // ecx
+	char *ptr;
 
-	v0 = pLightTbl;
-	pLightTbl = 0;
-	mem_free_dbg(v0);
+	ptr = pLightTbl;
+	pLightTbl = NULL;
+	mem_free_dbg(ptr);
 }
 
 void __cdecl InitLightTable()
diff --git a/Source/minitext.cpp b/Source/minitext.cpp
index 07d3ed596..d816d9c5c 100644
--- a/Source/minitext.cpp
+++ b/Source/minitext.cpp
@@ -41,15 +41,14 @@ int qscroll_spd_tbl[9] = { 2, 4, 6, 8, 0, -1, -2, -3, -4 };
 
 void __cdecl FreeQuestText()
 {
-	void *v0; // ecx
-	void *v1; // ecx
+	void *ptr;
 
-	v0 = pMedTextCels;
-	pMedTextCels = 0;
-	mem_free_dbg(v0);
-	v1 = pTextBoxCels;
-	pTextBoxCels = 0;
-	mem_free_dbg(v1);
+	ptr = pMedTextCels;
+	pMedTextCels = NULL;
+	mem_free_dbg(ptr);
+	ptr = pTextBoxCels;
+	pTextBoxCels = NULL;
+	mem_free_dbg(ptr);
 }
 
 void __cdecl InitQuestText()
diff --git a/Source/objects.cpp b/Source/objects.cpp
index 9881d75dc..26f09b171 100644
--- a/Source/objects.cpp
+++ b/Source/objects.cpp
@@ -411,13 +411,13 @@ void __cdecl InitObjectGFX()
 
 void __cdecl FreeObjectGFX()
 {
-	int i;    // esi
-	void *v1; // ecx
+	int i;
+	void *ptr;
 
-	for (i = 0; i < numobjfiles; ++i) {
-		v1 = (void *)pObjCels[i];
-		pObjCels[i] = 0;
-		mem_free_dbg(v1);
+	for (i = 0; i < numobjfiles; i++) {
+		ptr = pObjCels[i];
+		pObjCels[i] = NULL;
+		mem_free_dbg(ptr);
 	}
 	numobjfiles = 0;
 }
@@ -2655,10 +2655,10 @@ void __fastcall ObjSetMini(int x, int y, int v)
 		mov		v4, eax
 	}
 #else
-	v1 = *((WORD *)&pMegaTiles[((WORD)v-1)*8])+1;
-	v2 = *((WORD *)&pMegaTiles[((WORD)v-1)*8]+1)+1;
-	v3 = *((WORD *)&pMegaTiles[((WORD)v-1)*8]+2)+1;
-	v4 = *((WORD *)&pMegaTiles[((WORD)v-1)*8]+3)+1;
+	v1 = *((WORD *)&pMegaTiles[((WORD)v - 1) * 8]) + 1;
+	v2 = *((WORD *)&pMegaTiles[((WORD)v - 1) * 8] + 1) + 1;
+	v3 = *((WORD *)&pMegaTiles[((WORD)v - 1) * 8] + 2) + 1;
+	v4 = *((WORD *)&pMegaTiles[((WORD)v - 1) * 8] + 3) + 1;
 #endif
 
 	xx = 2 * x + 16;