diff --git a/Source/DiabloUI/diabloui.cpp b/Source/DiabloUI/diabloui.cpp
index 2e6b11a2b..1270e8119 100644
--- a/Source/DiabloUI/diabloui.cpp
+++ b/Source/DiabloUI/diabloui.cpp
@@ -892,7 +892,8 @@ bool HandleMouseEventScrollBar(const SDL_Event &event, const UiScrollBar *uiSb)
 		if (IsInsideRect(event, UpArrowRect(uiSb))) {
 			scrollBarState.upArrowPressed = true;
 			return true;
-		} else if (IsInsideRect(event, DownArrowRect(uiSb))) {
+		}
+		if (IsInsideRect(event, DownArrowRect(uiSb))) {
 			scrollBarState.downArrowPressed = true;
 			return true;
 		}
diff --git a/Source/controls/plrctrls.cpp b/Source/controls/plrctrls.cpp
index ca565f54e..97b239c67 100644
--- a/Source/controls/plrctrls.cpp
+++ b/Source/controls/plrctrls.cpp
@@ -1124,13 +1124,17 @@ HandleLeftStickOrDPadFn GetLeftStickOrDPadGameUIHandler()
 	}
 	if (chrflag && plr[myplr]._pStatPts > 0) {
 		return &AttrIncBtnSnap;
-	} else if (spselflag) {
+	}
+	if (spselflag) {
 		return &HotSpellMove;
-	} else if (sbookflag) {
+	}
+	if (sbookflag) {
 		return &SpellBookMove;
-	} else if (questlog) {
+	}
+	if (questlog) {
 		return &QuestLogMove;
-	} else if (stextflag != STORE_NONE) {
+	}
+	if (stextflag != STORE_NONE) {
 		return &StoreMove;
 	}
 	return nullptr;
diff --git a/Source/controls/touch.cpp b/Source/controls/touch.cpp
index d20309e15..ef8bd6d32 100644
--- a/Source/controls/touch.cpp
+++ b/Source/controls/touch.cpp
@@ -18,8 +18,8 @@ inline T clip(T v, T amin, T amax)
 		return amin;
 	if (v > amax)
 		return amax;
-	else
-		return v;
+
+	return v;
 }
 
 #define TOUCH_PORT_MAX_NUM 1
diff --git a/Source/dvlnet/protocol_zt.cpp b/Source/dvlnet/protocol_zt.cpp
index 665291938..1d3a6c2a3 100644
--- a/Source/dvlnet/protocol_zt.cpp
+++ b/Source/dvlnet/protocol_zt.cpp
@@ -135,7 +135,8 @@ bool protocol_zt::send_queued_peer(const endpoint &peer)
 			auto it = peer_list[peer].send_queue.front().begin();
 			peer_list[peer].send_queue.front().erase(it, it + r);
 			return true;
-		} else if (decltype(len)(r) == len) {
+		}
+		if (decltype(len)(r) == len) {
 			peer_list[peer].send_queue.pop_front();
 		} else {
 			throw protocol_exception();
diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
index a184f86f5..2153441eb 100644
--- a/Source/loadsave.cpp
+++ b/Source/loadsave.cpp
@@ -916,9 +916,11 @@ bool IsHeaderValid(uint32_t magicNumber)
 	if (magicNumber == LoadLE32("SHLF")) {
 		gbIsHellfireSaveGame = true;
 		return true;
-	} else if (!gbIsSpawn && magicNumber == LoadLE32("RETL")) {
+	}
+	if (!gbIsSpawn && magicNumber == LoadLE32("RETL")) {
 		return true;
-	} else if (!gbIsSpawn && magicNumber == LoadLE32("HELF")) {
+	}
+	if (!gbIsSpawn && magicNumber == LoadLE32("HELF")) {
 		gbIsHellfireSaveGame = true;
 		return true;
 	}
diff --git a/Source/missiles.cpp b/Source/missiles.cpp
index 9c7c442ee..8f3960e98 100644
--- a/Source/missiles.cpp
+++ b/Source/missiles.cpp
@@ -458,7 +458,7 @@ bool MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, bool shift)
 #ifdef _DEBUG
 	if (hit < hper || debug_mode_dollar_sign || debug_mode_key_inverted_v || monster[m]._mmode == MM_STONE) {
 #else
-	else if (hit < hper || monster[m]._mmode == MM_STONE) {
+	if (hit < hper || monster[m]._mmode == MM_STONE) {
 #endif
 		dam = mindam + GenerateRnd(maxdam - mindam + 1);
 		if (!shift)
diff --git a/Source/player.cpp b/Source/player.cpp
index e1db6112f..a44935b24 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -3322,7 +3322,8 @@ bool PlrDeathModeOK(int p)
 	}
 	if (player._pmode == PM_QUIT) {
 		return true;
-	} else if (player._pmode == PM_NEWLVL) {
+	}
+	if (player._pmode == PM_NEWLVL) {
 		return true;
 	}