diff --git a/client/src/mifare/desfirecore.c b/client/src/mifare/desfirecore.c
index 29454e018..26c21494f 100644
--- a/client/src/mifare/desfirecore.c
+++ b/client/src/mifare/desfirecore.c
@@ -523,7 +523,7 @@ static void DesfireSplitBytesToBlock(uint8_t *blockdata, size_t *blockdatacount,
 
 int DesfireExchangeEx(bool activate_field, DesfireContext *ctx, uint8_t cmd, uint8_t *data, size_t datalen, uint8_t *respcode, uint8_t *resp, size_t *resplen, bool enable_chaining, size_t splitbysize) {
     int res = PM3_SUCCESS;
-    
+
     if (!PrintChannelModeWarning(cmd, ctx->secureChannel, ctx->cmdSet, ctx->commMode))
         DesfirePrintContext(ctx);
 
@@ -964,19 +964,19 @@ int DesfireChangeKeySettings(DesfireContext *dctx, uint8_t *data, size_t len) {
 }
 
 static void PrintKeyType(uint8_t keytype) {
-    switch(keytype) {
-    case 00:
-        PrintAndLogEx(SUCCESS, "Key: 2TDEA");
-        break;
-    case 01:
-        PrintAndLogEx(SUCCESS, "Key: 3TDEA");
-        break;
-    case 02:
-        PrintAndLogEx(SUCCESS, "Key: AES");
-        break;
-    default:
-        PrintAndLogEx(SUCCESS, "Key: unknown: 0x%02x", keytype);
-        break;
+    switch (keytype) {
+        case 00:
+            PrintAndLogEx(SUCCESS, "Key: 2TDEA");
+            break;
+        case 01:
+            PrintAndLogEx(SUCCESS, "Key: 3TDEA");
+            break;
+        case 02:
+            PrintAndLogEx(SUCCESS, "Key: AES");
+            break;
+        default:
+            PrintAndLogEx(SUCCESS, "Key: unknown: 0x%02x", keytype);
+            break;
     }
 }
 
@@ -1014,7 +1014,7 @@ static void PrintKeySettingsApp(uint8_t keysettings, uint8_t numkeys, bool print
                          );
             break;
     }
-    
+
     PrintAndLogEx(SUCCESS, "[%c...] AMK Configuration changeable   : %s", (keysettings & (1 << 3)) ? '1' : '0', (keysettings & (1 << 3)) ? _GREEN_("YES") : "NO (frozen)");
     PrintAndLogEx(SUCCESS, "[.%c..] AMK required for create/delete : %s", (keysettings & (1 << 2)) ? '1' : '0', (keysettings & (1 << 2)) ? "NO" : "YES");
     PrintAndLogEx(SUCCESS, "[..%c.] Directory list access with AMK : %s", (keysettings & (1 << 1)) ? '1' : '0', (keysettings & (1 << 1)) ? "NO" : "YES");
diff --git a/client/src/mifare/desfiresecurechan.c b/client/src/mifare/desfiresecurechan.c
index a56af3493..ce24b22d2 100644
--- a/client/src/mifare/desfiresecurechan.c
+++ b/client/src/mifare/desfiresecurechan.c
@@ -101,7 +101,7 @@ static void DesfireSecureChannelEncodeD40(DesfireContext *ctx, uint8_t cmd, uint
 static void DesfireSecureChannelEncodeEV1(DesfireContext *ctx, uint8_t cmd, uint8_t *srcdata, size_t srcdatalen, uint8_t *dstdata, size_t *dstdatalen) {
     uint8_t data[1024] = {0};
     size_t rlen = 0;
-    
+
     // we calc MAC anyway
     // if encypted channel and no data - we only calc MAC
     if (ctx->commMode == DCMPlain || ctx->commMode == DCMMACed || (ctx->commMode == DCMEncrypted && srcdatalen == 0)) {
@@ -121,9 +121,9 @@ static void DesfireSecureChannelEncodeEV1(DesfireContext *ctx, uint8_t cmd, uint
         data[0] = cmd;
         memcpy(&data[1], srcdata, srcdatalen);
         desfire_crc32_append(data, srcdatalen + 1);
-        
+
         DesfireCryptoEncDec(ctx, true, &data[1], rlen, dstdata, true);
-        
+
         *dstdatalen = rlen;
     } else {
         memcpy(dstdata, srcdata, srcdatalen);
@@ -256,38 +256,38 @@ bool PrintChannelModeWarning(uint8_t cmd, DesfireSecureChannel secureChannel, De
         PrintAndLogEx(WARNING, "Communication mode can't be NONE. command: %02x", cmd);
         return false;
     }
-    
+
     // no security set
     if (secureChannel == DACNone)
         return true;
-    
+
     bool found = false;
     for (int i = 0; i < ARRAY_LENGTH(AllowedChannelModes); i++)
         if (AllowedChannelModes[i].cmd == cmd) {
             // full compare
-            if (AllowedChannelModes[i].secureChannel == secureChannel && 
-                (AllowedChannelModes[i].cmdSet == cmdSet || (AllowedChannelModes[i].cmdSet == DCCNative && cmdSet == DCCNativeISO)) && 
-                AllowedChannelModes[i].commMode == commMode){
+            if (AllowedChannelModes[i].secureChannel == secureChannel &&
+                    (AllowedChannelModes[i].cmdSet == cmdSet || (AllowedChannelModes[i].cmdSet == DCCNative && cmdSet == DCCNativeISO)) &&
+                    AllowedChannelModes[i].commMode == commMode) {
 
                 found = true;
                 break;
             }
-            
+
             // ev1 plain and mac are the same
-            if (AllowedChannelModes[i].secureChannel == secureChannel && 
-                AllowedChannelModes[i].secureChannel == DACEV1 &&
-                (AllowedChannelModes[i].cmdSet == cmdSet || (AllowedChannelModes[i].cmdSet == DCCNative && cmdSet == DCCNativeISO)) && 
-                (commMode == DCMPlain || commMode == DCMMACed)){
+            if (AllowedChannelModes[i].secureChannel == secureChannel &&
+                    AllowedChannelModes[i].secureChannel == DACEV1 &&
+                    (AllowedChannelModes[i].cmdSet == cmdSet || (AllowedChannelModes[i].cmdSet == DCCNative && cmdSet == DCCNativeISO)) &&
+                    (commMode == DCMPlain || commMode == DCMMACed)) {
 
                 found = true;
                 break;
             }
-            
+
         }
-    
+
     if (!found)
         PrintAndLogEx(WARNING, "Wrong communication mode. Check settings. command: %02x", cmd);
-    
+
     return found;
 }