diff --git a/armsrc/frozen.c b/armsrc/frozen.c
index 6477e0602..4abd21ebf 100644
--- a/armsrc/frozen.c
+++ b/armsrc/frozen.c
@@ -863,7 +863,7 @@ struct json_scanf_info {
 int json_unescape(const char *src, int slen, char *dst, int dlen) WEAK;
 int json_unescape(const char *src, int slen, char *dst, int dlen) {
     if (dst == NULL || dlen == 0)
-	    return JSON_STRING_INVALID;
+        return JSON_STRING_INVALID;
 
     char *send = (char *) src + slen;
     char *dend = dst + dlen;
diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c
index be5975049..b8c2271e1 100644
--- a/client/src/cmdhfmfdes.c
+++ b/client/src/cmdhfmfdes.c
@@ -1900,7 +1900,7 @@ static int CmdHF14ADesCreateApp(const char *Cmd) {
     if (res != PM3_SUCCESS) {
         DropField();
         return res;
-     }
+    }
 
     res = handler_desfire_createapp(&aidhdr, usename, usefid);
     DropField();
@@ -3245,7 +3245,7 @@ static int CmdHF14ADesDump(const char *Cmd) {
                     PrintAndLogEx(NORMAL, "----------------------------------------------------------------------------");
                     int len = le24toh(fdata.length);
                     for (int n = 0; n < len; n += 16) {
-                         PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s", n, n, sprint_hex(&fdata.data[n], len > 16 ? 16 : len), sprint_ascii(&fdata.data[n], len > 16 ? 16 : len));
+                        PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s", n, n, sprint_hex(&fdata.data[n], len > 16 ? 16 : len), sprint_ascii(&fdata.data[n], len > 16 ? 16 : len));
                     }
                 } else {
                     PrintAndLogEx(ERR, "Couldn't read value. Error %d", res);
@@ -3262,15 +3262,15 @@ static int CmdHF14ADesDump(const char *Cmd) {
                 int len = 0;
                 res = handler_desfire_getvalue(&value, &len);
                 if (res == PM3_SUCCESS) {
-                     PrintAndLogEx(NORMAL, "\nOffset  | Value                                            | Ascii");
-                     PrintAndLogEx(NORMAL, "----------------------------------------------------------------------------");
-                     for (int n = 0; n < len; n += 16) {
-                          PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s", n, n, sprint_hex(&value.value[n], len > 16 ? 16 : len), sprint_ascii(&value.value[n], len > 16 ? 16 : len));
-                     }
+                    PrintAndLogEx(NORMAL, "\nOffset  | Value                                            | Ascii");
+                    PrintAndLogEx(NORMAL, "----------------------------------------------------------------------------");
+                    for (int n = 0; n < len; n += 16) {
+                        PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s", n, n, sprint_hex(&value.value[n], len > 16 ? 16 : len), sprint_ascii(&value.value[n], len > 16 ? 16 : len));
+                    }
                 } else {
-                     PrintAndLogEx(ERR, "Couldn't read value. Error %d", res);
-                     res = handler_desfire_select_application(aid);
-                     if (res != PM3_SUCCESS) continue;
+                    PrintAndLogEx(ERR, "Couldn't read value. Error %d", res);
+                    res = handler_desfire_select_application(aid);
+                    if (res != PM3_SUCCESS) continue;
                 }
 
             } else if (fileset_len == 1 + 1 + 2 + 3 + 3 + 3 + maclen) {
@@ -3294,15 +3294,15 @@ static int CmdHF14ADesDump(const char *Cmd) {
                     fdata.offset[2] = (offset >> 16) & 0xFF;
                     res = handler_desfire_readdata(&fdata, MFDES_RECORD_FILE);
                     if (res == PM3_SUCCESS) {
-                         PrintAndLogEx(NORMAL, "\nOffset  | Data                                            | Ascii");
-                         PrintAndLogEx(NORMAL, "----------------------------------------------------------------------------");
-                         int len = le24toh(fdata.length);
-                         for (int n = 0; n < len; n += 16) {
-                             PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s", n, n, sprint_hex(&fdata.data[n], len > 16 ? 16 : len), sprint_ascii(&fdata.data[n], len > 16 ? 16 : len));
-                         }
+                        PrintAndLogEx(NORMAL, "\nOffset  | Data                                            | Ascii");
+                        PrintAndLogEx(NORMAL, "----------------------------------------------------------------------------");
+                        int len = le24toh(fdata.length);
+                        for (int n = 0; n < len; n += 16) {
+                            PrintAndLogEx(NORMAL, "%02d/0x%02X | %s| %s", n, n, sprint_hex(&fdata.data[n], len > 16 ? 16 : len), sprint_ascii(&fdata.data[n], len > 16 ? 16 : len));
+                        }
                     } else {
-                         res = handler_desfire_select_application(aid);
-                         if (res != PM3_SUCCESS) continue;
+                        res = handler_desfire_select_application(aid);
+                        if (res != PM3_SUCCESS) continue;
                     }
                 }
                 free(data);
@@ -3586,9 +3586,9 @@ void DesFill2bPattern(uint8_t deskeyList[MAX_KEYS_LIST_LEN][8], size_t *deskeyLi
         }
 
         *startPattern = pt;
-        if ( (*deskeyListLen == MAX_KEYS_LIST_LEN) &&
-             (*aeskeyListLen == MAX_KEYS_LIST_LEN) &&
-             (*k3kkeyListLen == MAX_KEYS_LIST_LEN)) {
+        if ((*deskeyListLen == MAX_KEYS_LIST_LEN) &&
+                (*aeskeyListLen == MAX_KEYS_LIST_LEN) &&
+                (*k3kkeyListLen == MAX_KEYS_LIST_LEN)) {
             break;
         }
     }
diff --git a/client/src/loclass/cipher.c b/client/src/loclass/cipher.c
index af5d4f3a3..080ff66f5 100644
--- a/client/src/loclass/cipher.c
+++ b/client/src/loclass/cipher.c
@@ -68,17 +68,17 @@ typedef struct {
 *  T (x 0 x 1 . . . . . . x 15 ) = x 0 ⊕ x 1 ⊕ x 5 ⊕ x 7 ⊕ x 10 ⊕ x 11 ⊕ x 14 ⊕ x 15 .
 **/
 static bool T(State state) {
-/*
-    bool x0 = state.t & 0x8000;
-    bool x1 = state.t & 0x4000;
-    bool x5 = state.t & 0x0400;
-    bool x7 = state.t & 0x0100;
-    bool x10 = state.t & 0x0020;
-    bool x11 = state.t & 0x0010;
-    bool x14 = state.t & 0x0002;
-    bool x15 = state.t & 0x0001;
-    return x0 ^ x1 ^ x5 ^ x7 ^ x10 ^ x11 ^ x14 ^ x15;
-*/
+    /*
+        bool x0 = state.t & 0x8000;
+        bool x1 = state.t & 0x4000;
+        bool x5 = state.t & 0x0400;
+        bool x7 = state.t & 0x0100;
+        bool x10 = state.t & 0x0020;
+        bool x11 = state.t & 0x0010;
+        bool x14 = state.t & 0x0002;
+        bool x15 = state.t & 0x0001;
+        return x0 ^ x1 ^ x5 ^ x7 ^ x10 ^ x11 ^ x14 ^ x15;
+    */
 #define  _x0  ((state.t & 0x8000) >> 15 )
 #define  _x1  ((state.t & 0x4000) >> 14 )
 #define  _x5  ((state.t & 0x0400) >> 10 )
@@ -86,7 +86,7 @@ static bool T(State state) {
 #define  _x10 ((state.t & 0x0020) >> 5 )
 #define  _x11 ((state.t & 0x0010) >> 4 )
 #define  _x14 ((state.t & 0x0002) >> 1 )
-#define  _x15 (state.t & 0x0001) 
+#define  _x15 (state.t & 0x0001)
     return (_x0) ^ (_x1) ^ (_x5) ^ (_x7) ^ (_x10) ^ (_x11) ^ (_x14) ^ (_x15);
 }
 /**
@@ -114,49 +114,49 @@ static bool T(State state) {
 *  z 2 = (r 3 ∧ r 5 ) ⊕ (r 4 ∧ r 6 ) ⊕ r 7 ⊕ x
 **/
 static uint8_t _select(bool x, bool y, uint8_t r) {
- #define _r0 ((r >> 7) & 0x01)
- #define _r1 ((r >> 6) & 0x01)
- #define _r2 ((r >> 5) & 0x01)
- #define _r3 ((r >> 4) & 0x01)
- #define _r4 ((r >> 3) & 0x01)
- #define _r5 ((r >> 2) & 0x01)
- #define _r6 ((r >> 1) & 0x01)
- #define _r7 (r & 0x01)
+#define _r0 ((r >> 7) & 0x01)
+#define _r1 ((r >> 6) & 0x01)
+#define _r2 ((r >> 5) & 0x01)
+#define _r3 ((r >> 4) & 0x01)
+#define _r4 ((r >> 3) & 0x01)
+#define _r5 ((r >> 2) & 0x01)
+#define _r6 ((r >> 1) & 0x01)
+#define _r7 (r & 0x01)
 
- #define _z0  ( (_r0 & _r2) ^ ( _r1 & (!_r3)) ^ (_r2 | _r4) )
- #define _z1  ( (_r0 | _r2) ^ ( _r5 | _r7) ^_r1 ^ _r6 ^ x ^ y )
- #define _z2  ( (_r3 & (!_r5)) ^ (_r4 & _r6) ^ _r7 ^ x )
+#define _z0  ( (_r0 & _r2) ^ ( _r1 & (!_r3)) ^ (_r2 | _r4) )
+#define _z1  ( (_r0 | _r2) ^ ( _r5 | _r7) ^_r1 ^ _r6 ^ x ^ y )
+#define _z2  ( (_r3 & (!_r5)) ^ (_r4 & _r6) ^ _r7 ^ x )
 
-/*
-    uint8_t r0 = r >> 7 & 0x1;
-    uint8_t r1 = r >> 6 & 0x1;
-    uint8_t r2 = r >> 5 & 0x1;
-    uint8_t r3 = r >> 4 & 0x1;
-    uint8_t r4 = r >> 3 & 0x1;
-    uint8_t r5 = r >> 2 & 0x1;
-    uint8_t r6 = r >> 1 & 0x1;
-    uint8_t r7 = r & 0x1;
+    /*
+        uint8_t r0 = r >> 7 & 0x1;
+        uint8_t r1 = r >> 6 & 0x1;
+        uint8_t r2 = r >> 5 & 0x1;
+        uint8_t r3 = r >> 4 & 0x1;
+        uint8_t r4 = r >> 3 & 0x1;
+        uint8_t r5 = r >> 2 & 0x1;
+        uint8_t r6 = r >> 1 & 0x1;
+        uint8_t r7 = r & 0x1;
 
-    bool z0 = (r0 & r2) ^ (r1 & (!r3)) ^ (r2 | r4);
-    bool z1 = (r0 | r2) ^ (r5 | r7) ^ r1 ^ r6 ^ x ^ y;
-    bool z2 = (r3 & (!r5)) ^ (r4 & r6) ^ r7 ^ x;
+        bool z0 = (r0 & r2) ^ (r1 & (!r3)) ^ (r2 | r4);
+        bool z1 = (r0 | r2) ^ (r5 | r7) ^ r1 ^ r6 ^ x ^ y;
+        bool z2 = (r3 & (!r5)) ^ (r4 & r6) ^ r7 ^ x;
 
-    // The three bitz z0.. z1 are packed into a uint8_t:
-    // 00000ZZZ
-    //Return value is a uint8_t
-    return ((z0 << 2) & 4) | ((z1 << 1) & 2) | (z2 & 1);
-*/
-   return  ((_z0 << 2) & 4) | ((_z1 << 1) & 2) | (_z2 & 1);
+        // The three bitz z0.. z1 are packed into a uint8_t:
+        // 00000ZZZ
+        //Return value is a uint8_t
+        return ((z0 << 2) & 4) | ((z1 << 1) & 2) | (z2 & 1);
+    */
+    return ((_z0 << 2) & 4) | ((_z1 << 1) & 2) | (_z2 & 1);
 
-/*
-    uint8_t retval = 0;
-    retval |= (z0 << 2) & 4;
-    retval |= (z1 << 1) & 2;
-    retval |= (z2) & 1;
+    /*
+        uint8_t retval = 0;
+        retval |= (z0 << 2) & 4;
+        retval |= (z1 << 1) & 2;
+        retval |= (z2) & 1;
 
-    // Return value 0 <= retval <= 7
-    return retval;
-*/
+        // Return value 0 <= retval <= 7
+        return retval;
+    */
 }
 
 /**
diff --git a/client/src/mifare/desfire_crypto.c b/client/src/mifare/desfire_crypto.c
index a0e066b44..2cb9d7c3a 100644
--- a/client/src/mifare/desfire_crypto.c
+++ b/client/src/mifare/desfire_crypto.c
@@ -282,7 +282,7 @@ void cmac_generate_subkeys(desfirekey_t key) {
 void cmac(const desfirekey_t key, uint8_t *ivect, const uint8_t *data, size_t len, uint8_t *cmac) {
     int kbs = key_block_size(key);
     if (kbs == 0) {
-       return;
+        return;
     }
 
     uint8_t *buffer = malloc(padded_data_length(len, kbs));
diff --git a/client/src/preferences.c b/client/src/preferences.c
index b0534a671..4f92eb06e 100644
--- a/client/src/preferences.c
+++ b/client/src/preferences.c
@@ -95,7 +95,7 @@ int preferences_load(void) {
     size_t dummyDL = 0x00;
 
     // to better control json cant find file error msg.
-    char* fn = prefGetFilename();
+    char *fn = prefGetFilename();
     if (fileExists(fn)) {
         PrintAndLogEx(INFO, "Loading Preferences...");
         if (loadFileJSON(fn, &dummyData, sizeof(dummyData), &dummyDL) == PM3_SUCCESS) {
@@ -115,11 +115,11 @@ int preferences_save(void) {
 
     PrintAndLogEx(INFO, "Saving Preferences...");
 
-    char* fn = prefGetFilename();
+    char *fn = prefGetFilename();
     int fnLen = strlen(fn) + 5; // .bak\0
 
     // [FILENAME_MAX+sizeof(preferencesFilename)+10]
-    char* backupFilename = (char *)calloc(fnLen, sizeof(uint8_t));
+    char *backupFilename = (char *)calloc(fnLen, sizeof(uint8_t));
     if (backupFilename == NULL) {
         PrintAndLogEx(ERR, "failed to allocate memory");
         free(fn);
@@ -916,7 +916,7 @@ int CmdPrefSet(const char *Cmd) {
 
 static int CmdPrefShow(const char *Cmd) {
 
-    char* fn = prefGetFilename();
+    char *fn = prefGetFilename();
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(NORMAL, _CYAN_("Preferences loaded from %s"), fn);
 
diff --git a/tools/hitag2crack/crack5/ht2crack5.c b/tools/hitag2crack/crack5/ht2crack5.c
index 79557bbfd..7f10ccd6b 100644
--- a/tools/hitag2crack/crack5/ht2crack5.c
+++ b/tools/hitag2crack/crack5/ht2crack5.c
@@ -117,9 +117,9 @@ int main(int argc, char *argv[]) {
     uint32_t target = 0;
 
 #ifndef __WIN32
-	thread_count = sysconf(_SC_NPROCESSORS_CONF);
-	if ( thread_count < 2)
-		thread_count = 2;
+    thread_count = sysconf(_SC_NPROCESSORS_CONF);
+    if (thread_count < 2)
+        thread_count = 2;
 #endif  /* _WIN32 */
 
 
diff --git a/tools/hitag2crack/crack5gpu/ht2crack5.c b/tools/hitag2crack/crack5gpu/ht2crack5.c
index adaf1ae82..cfacecc98 100644
--- a/tools/hitag2crack/crack5gpu/ht2crack5.c
+++ b/tools/hitag2crack/crack5gpu/ht2crack5.c
@@ -236,7 +236,7 @@ int main(int argc, char *argv[]) {
     for (size_t i0 = 0; i0 < 1 << 20; i0++) {
         uint64_t state0 = expand(0x5806b4a2d16c, i0);
 
-        if (f(state0) == target >> 31 ) {
+        if (f(state0) == target >> 31) {
             // cf kernel, state is now split in 3 shorts >> 2
             candidates[(layer_0_found * 3) + 0] = (uint16_t)((state0 >> (32 + 2)) & 0xffff);
             candidates[(layer_0_found * 3) + 1] = (uint16_t)((state0 >> (16 + 2)) & 0xffff);