diff --git a/armsrc/felica.c b/armsrc/felica.c
index c9ebf9969..06bc53e99 100644
--- a/armsrc/felica.c
+++ b/armsrc/felica.c
@@ -418,7 +418,7 @@ bool WaitForFelicaReply(uint16_t maxbytes) {
             Process18092Byte(b);
             if (FelicaFrame.state == STATE_FULL) {
                 felica_nexttransfertime = MAX(felica_nexttransfertime,
-                        (GetCountSspClk() & 0xfffffff8) - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER) / 16 + FELICA_FRAME_DELAY_TIME);
+                                              (GetCountSspClk() & 0xfffffff8) - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER) / 16 + FELICA_FRAME_DELAY_TIME);
 
                 LogTrace(
                     FelicaFrame.framebytes,
@@ -593,13 +593,13 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
             if (FelicaFrame.state == STATE_FULL) {
                 //Dbprintf("Sniffing - Got Felica Frame! Sample remaining %i", remFrames);
                 remFrames--;
-                if (remFrames <= 0){
+                if (remFrames <= 0) {
                     Dbprintf("Stop Sniffing - samplesToSkip reached!");
                     break;
                 }
-                if((FelicaFrame.framebytes[3] % 2) == 0){
+                if ((FelicaFrame.framebytes[3] % 2) == 0) {
                     isTagFrame = false; // All Reader Frames are even and all Tag frames are odd
-                } else{
+                } else {
                     isTagFrame = true;
                 }
                 LogTrace(FelicaFrame.framebytes,
@@ -608,7 +608,7 @@ void felica_sniff(uint32_t samplesToSkip, uint32_t triggersToSkip) {
                          ((GetCountSspClk() & 0xfffffff8) << 4) - DELAY_AIR2ARM_AS_READER,
                          NULL,
                          isTagFrame
-                );
+                        );
                 numbts += FelicaFrame.len;
                 FelicaFrameReset();
             }
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 427ca07c1..03bd390c2 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -795,7 +795,7 @@ static int CmdHFFelicaSniff(const char *Cmd) {
                     paramCount++;
                     if (param_getlength(Cmd, paramCount) < 5) {
                         samples2skip = param_get32ex(Cmd, paramCount++, 0, 10);
-                    }else{
+                    } else {
                         PrintAndLogEx(ERR, "Invalid samples number!");
                         return PM3_EINVARG;
                     }
@@ -805,7 +805,7 @@ static int CmdHFFelicaSniff(const char *Cmd) {
                     paramCount++;
                     if (param_getlength(Cmd, paramCount) < 5) {
                         triggers2skip = param_get32ex(Cmd, paramCount++, 0, 10);
-                    }else{
+                    } else {
                         PrintAndLogEx(ERR, "Invalid triggers number!");
                         return PM3_EINVARG;
                     }
@@ -818,11 +818,11 @@ static int CmdHFFelicaSniff(const char *Cmd) {
         }
         i++;
     }
-    if(samples2skip <= 0){
+    if (samples2skip <= 0) {
         samples2skip = 10;
         PrintAndLogEx(INFO, "Set default samples2skip: %i", samples2skip);
     }
-    if(triggers2skip <= 0){
+    if (triggers2skip <= 0) {
         triggers2skip = 5000;
         PrintAndLogEx(INFO, "Set default triggers2skip: %i", triggers2skip);
     }
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 17dbd2fd0..06e45f515 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -243,7 +243,7 @@ static int CmdFdxDemod(const char *Cmd) {
 
     uint8_t c[] = {0, 0};
     compute_crc(CRC_11784, raw, sizeof(raw), &c[0], &c[1]);
-    PrintAndLogEx(SUCCESS, "CRC-16             0x%04X  [ %s] ", crc, (crc ==  (c[1] << 8 | c[0]) ) ? _GREEN_("OK") : _RED_("Fail"));
+    PrintAndLogEx(SUCCESS, "CRC-16             0x%04X  [ %s] ", crc, (crc == (c[1] << 8 | c[0])) ? _GREEN_("OK") : _RED_("Fail"));
 
     if (g_debugMode) {
         PrintAndLogEx(DEBUG, "Start marker %d;   Size %zu", preambleIndex, size);
@@ -313,7 +313,7 @@ static int CmdFdxSim(const char *Cmd) {
 
     countryid = param_get32ex(Cmd, 0, 0, 10);
     animalid = param_get64ex(Cmd, 1, 0, 10);
-    extended = param_get32ex(Cmd, 2, 0 , 10);
+    extended = param_get32ex(Cmd, 2, 0, 10);
 
     verify_values(&animalid, &countryid);
 
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 77aab71e5..67f15be59 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -257,7 +257,7 @@ static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *tr
             case ISO_14443B:
             case TOPAZ:
             case FELICA:
-                crcStatus = !felica_CRC_check(frame+2, data_len-4);
+                crcStatus = !felica_CRC_check(frame + 2, data_len - 4);
                 break;
             case PROTO_MIFARE:
                 crcStatus = mifare_CRC_check(isResponse, frame, data_len);
@@ -350,7 +350,7 @@ static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *tr
     if (protocol == PROTO_MIFARE)
         annotateMifare(explanation, sizeof(explanation), frame, data_len, parityBytes, parity_len, isResponse);
 
-    if(protocol == FELICA)
+    if (protocol == FELICA)
         annotateFelica(explanation, sizeof(explanation), frame, data_len);
 
     if (!isResponse) {