diff --git a/x64_dbg_dbg/debugger_commands.cpp b/x64_dbg_dbg/debugger_commands.cpp
index 39f4cf46..fe889a88 100644
--- a/x64_dbg_dbg/debugger_commands.cpp
+++ b/x64_dbg_dbg/debugger_commands.cpp
@@ -409,11 +409,11 @@ CMDRESULT cbDebugDisableBPX(int argc, char* argv[])
 
 CMDRESULT cbDebugBplist(int argc, char* argv[])
 {
-	if (!BpEnumAll(cbBreakpointList))
-	{
-		dputs("Something went wrong...");
-		return STATUS_ERROR;
-	}
+    if(!BpEnumAll(cbBreakpointList))
+    {
+        dputs("Something went wrong...");
+        return STATUS_ERROR;
+    }
     return STATUS_CONTINUE;
 }
 
@@ -472,11 +472,11 @@ CMDRESULT cbDebugHide(int argc, char* argv[])
 CMDRESULT cbDebugDisasm(int argc, char* argv[])
 {
     uint addr = 0;
-	if (argc > 1)
-	{
-		if (!valfromstring(argv[1], &addr))
-			addr = GetContextDataEx(hActiveThread, UE_CIP);
-	}
+    if(argc > 1)
+    {
+        if(!valfromstring(argv[1], &addr))
+            addr = GetContextDataEx(hActiveThread, UE_CIP);
+    }
     if(!MemIsValidReadPtr(addr))
         return STATUS_CONTINUE;
     DebugUpdateGui(addr, false);
@@ -1847,11 +1847,11 @@ CMDRESULT cbDebugLoadLib(int argc, char* argv[])
 
     GetFullContextDataEx(LoadLibThread, &backupctx);
 
-	if (!valfromstring("kernel32:LoadLibraryA", &LoadLibraryA, false))
-	{
-		dprintf("Error: couldn't get kernel32:LoadLibraryA");
-		return STATUS_ERROR;
-	}
+    if(!valfromstring("kernel32:LoadLibraryA", &LoadLibraryA, false))
+    {
+        dprintf("Error: couldn't get kernel32:LoadLibraryA");
+        return STATUS_ERROR;
+    }
 
     // Arch specific asm code
 #ifdef _WIN64
diff --git a/x64_dbg_dbg/instruction.cpp b/x64_dbg_dbg/instruction.cpp
index 917bc020..0b5e7089 100644
--- a/x64_dbg_dbg/instruction.cpp
+++ b/x64_dbg_dbg/instruction.cpp
@@ -1218,11 +1218,11 @@ CMDRESULT cbInstrFindAll(int argc, char* argv[])
                 k += sprintf(msg + k, "%.2X", printData[j]);
             }
         }
-		else
-		{
-			if (!GuiGetDisassembly(result, msg))
-				strcpy_s(msg, "[Error disassembling]");
-		}
+        else
+        {
+            if(!GuiGetDisassembly(result, msg))
+                strcpy_s(msg, "[Error disassembling]");
+        }
         GuiReferenceSetCellContent(refCount, 1, msg);
         result++;
         refCount++;
@@ -1755,18 +1755,18 @@ CMDRESULT cbInstrYara(int argc, char* argv[])
             else
                 dputs("error while getting the rules!");
         }
-		else
-		{
-			fclose(rulesFile);
-			dputs("errors in the rules file!");
-		}
+        else
+        {
+            fclose(rulesFile);
+            dputs("errors in the rules file!");
+        }
         yr_compiler_destroy(yrCompiler);
     }
-	else
-	{
-		fclose(rulesFile);
-		dputs("yr_compiler_create failed!");
-	}
+    else
+    {
+        fclose(rulesFile);
+        dputs("yr_compiler_create failed!");
+    }
     return bSuccess ? STATUS_CONTINUE : STATUS_ERROR;
 }
 
diff --git a/x64_dbg_dbg/thread.cpp b/x64_dbg_dbg/thread.cpp
index 483afc3b..95c723d3 100644
--- a/x64_dbg_dbg/thread.cpp
+++ b/x64_dbg_dbg/thread.cpp
@@ -164,7 +164,7 @@ DWORD ThreadGetLastError(DWORD ThreadId)
     SHARED_ACQUIRE(LockThreads);
 
     TEB teb;
-	memset(&teb, 0, sizeof(TEB));
+    memset(&teb, 0, sizeof(TEB));
     for(auto & entry : threadList)
     {
         if(entry.ThreadId != ThreadId)