diff --git a/pcsx2/IopGte.cpp b/pcsx2/IopGte.cpp
index c766ae1f29..4a425569bc 100644
--- a/pcsx2/IopGte.cpp
+++ b/pcsx2/IopGte.cpp
@@ -425,8 +425,9 @@ __inline s32 FNC_OVERFLOW4(s64 x) {
 }
 
 #define _LIMX(negv, posv, flagb) { \
-	if (x < (negv)) { x = (negv); gteFLAG |= (1<<(flagb)); } else \
-	if (x > (posv)) { x = (posv); gteFLAG |= (1<<(flagb)); } return (x); \
+	if (x < (negv)) { x = (negv); gteFLAG |= (1<<(flagb)); } \
+	else if (x > (posv)) { x = (posv); gteFLAG |= (1<<(flagb)); } \
+	return (x); \
 }
 
 __inline double limA1S(double x) { _LIMX(-32768.0, 32767.0, 24); }
@@ -450,7 +451,9 @@ __inline double limG1(double x) {
 
 	if (x >       1023.0) { x = 1023.0; gteFLAG |= (1 << 14); }
 	else
-		if (x <      -1024.0) { x = -1024.0; gteFLAG |= (1 << 14); } return (x);
+		if (x <      -1024.0) { x = -1024.0; gteFLAG |= (1 << 14); }
+	
+	return (x);
 }
 
 __inline double limG2(double x) {
@@ -460,7 +463,9 @@ __inline double limG2(double x) {
 
 	if (x >       1023.0) { x = 1023.0; gteFLAG |= (1 << 13); }
 	else
-		if (x < -1024.0) { x = -1024.0; gteFLAG |= (1 << 13); } return (x);
+		if (x < -1024.0) { x = -1024.0; gteFLAG |= (1 << 13); }
+
+	return (x);
 }
 
 __inline s32 F12limA1S(s64 x) { _LIMX(-32768 << 12, 32767 << 12, 24); }
@@ -487,12 +492,12 @@ __inline s32 FlimE(s32 x) { _LIMX(0, 65535, 12); }
 
 __inline s32 FlimG1(s64 x) {
 	if (x > 2147483647) { gteFLAG |= (1 << 16); }
-	else
-		if (x < (s64)0xffffffff80000000) { gteFLAG |= (1 << 15); }
-
+	else if (x < (s64)0xffffffff80000000) { gteFLAG |= (1 << 15); }
+	
 	if (x >       1023) { x = 1023; gteFLAG |= (1 << 14); }
-	else
-		if (x <      -1024) { x = -1024; gteFLAG |= (1 << 14); } return (x);
+	else if (x <      -1024) { x = -1024; gteFLAG |= (1 << 14); } 
+	
+	return (x);
 }
 
 __inline s32 FlimG2(s64 x) {
@@ -502,7 +507,9 @@ __inline s32 FlimG2(s64 x) {
 
 	if (x >       1023) { x = 1023; gteFLAG |= (1 << 13); }
 	else
-		if (x < -1024) { x = -1024; gteFLAG |= (1 << 13); } return (x);
+		if (x < -1024) { x = -1024; gteFLAG |= (1 << 13); } 
+	
+	return (x);
 }
 
 #define MAC2IR() { \
diff --git a/pcsx2/IopMem.cpp b/pcsx2/IopMem.cpp
index a3773e62c9..8672ab8578 100644
--- a/pcsx2/IopMem.cpp
+++ b/pcsx2/IopMem.cpp
@@ -499,5 +499,5 @@ std::string iopMemReadString(u32 mem, int maxlen)
     while ((c = iopMemRead8(mem++)) && maxlen--)
         ret.push_back(c);
 
-	return ret;
+    return ret;
 }
diff --git a/pcsx2/x86/ix86-32/iR5900Templates.cpp b/pcsx2/x86/ix86-32/iR5900Templates.cpp
index ae65960f86..3589ceebde 100644
--- a/pcsx2/x86/ix86-32/iR5900Templates.cpp
+++ b/pcsx2/x86/ix86-32/iR5900Templates.cpp
@@ -426,8 +426,8 @@ void eeRecompileCodeConst0(R5900FNPTR constcode, R5900FNPTR_INFO constscode, R59
 // rt = rs op imm16
 void eeRecompileCodeConst1(R5900FNPTR constcode, R5900FNPTR_INFO noconstcode)
 {
-    if ( ! _Rt_ )
-        return;
+	if ( ! _Rt_ )
+		return;
 
 	// for now, don't support xmm