diff --git a/client/cmddata.c b/client/cmddata.c
index b00de9adb..bbff0dc88 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1584,7 +1584,7 @@ int CmdTuneSamples(const char *Cmd) {
         GraphBuffer[i] = resp.d.asBytes[i] - 128;
         test1 += resp.d.asBytes[i];
     }
-    
+
     if (test1 > 0) {
         PrintAndLogEx(SUCCESS, "\nDisplaying LF tuning graph. Divisor 89 is 134khz, 95 is 125khz.\n\n");
         GraphTraceLen = 256;
@@ -1979,7 +1979,7 @@ int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
     // currently only know fsk modulations with field clocks < 10 samples and > 4 samples. filter out to remove false positives (and possibly destroying ask/psk modulated waves...)
     if (ans == 0 || clk == 0 || LowToneFC == 0 || HighToneFC == 0 || LowToneFC > 10 || HighToneFC < 4) {
         if (g_debugMode > 1) {
-            PrintAndLogEx(NORMAL,"DEBUG FSKtoNRZ: no fsk clocks found");
+            PrintAndLogEx(NORMAL, "DEBUG FSKtoNRZ: no fsk clocks found");
         }
         return 0;
     }
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index e78c07c76..2a768862a 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1734,7 +1734,7 @@ out:
 
         if (transferToEml) {
             uint8_t block[16] = {0x00};
-            for ( i = 0; i < sectorsCnt; ++i) {
+            for (i = 0; i < sectorsCnt; ++i) {
                 mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);
                 if (e_sector[i].foundKey[0])
                     num_to_bytes(e_sector[i].Key[0], 6, block);
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index 4b0350c06..4cb45616b 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -206,9 +206,9 @@ int zlib_decompress(FILE *infile, FILE *outfile) {
     compressed_fpga_stream.opaque = Z_NULL;
 
     ret = inflateInit2(&compressed_fpga_stream, 0);
-    if ( ret < 0 )
+    if (ret < 0)
         return (EXIT_FAILURE);
-    
+
     do {
         if (compressed_fpga_stream.avail_in == 0) {
             compressed_fpga_stream.next_in = inbuf;
diff --git a/common/lfdemod.c b/common/lfdemod.c
index 35a3385d3..81a8bb545 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1413,14 +1413,14 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
     //find correct start position [alignment]
     for (k = 0; k < 2; ++k) {
         for (i = k; i < *size - 1; i += 2) {
-          
+
             if (bits[i] == bits[i + 1])
                 errCnt++;
-            
-            if ( errCnt > 50) 
+
+            if (errCnt > 50)
                 break;
         }
-        
+
         if (bestErr > errCnt) {
             bestErr = errCnt;
             bestRun = k;
@@ -1428,7 +1428,7 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
         }
         errCnt = 0;
     }
-    
+
     *alignPos = bestRun;
     //decode
     for (i = bestRun; i < *size - 1; i += 2) {
@@ -1467,9 +1467,9 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
             if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)) {
 
                 // 8  ::   8-2-1 =  5   8+2+1 = 11
-                // 16 ::  16-4-1 = 11  16+4+1 = 21 
+                // 16 ::  16-4-1 = 11  16+4+1 = 21
                 // 32 ::  32-8-1 = 23  32+8+1 = 41
-                
+
                 if (smplCnt > clk - cl_4 - 1) { //full clock
 
                     if (smplCnt > clk + cl_4 + 1) { //too many samples
@@ -1517,11 +1517,11 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
     }
     *size = bitCnt;
 
-    if ( *startIdx < 0 )
+    if (*startIdx < 0)
         *startIdx = 0;
-    
+
     if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod Startidx %u ", *startIdx);
-   
+
     return errCnt;
 }
 
@@ -1912,7 +1912,7 @@ int pskRawDemod_ext(uint8_t *dest, size_t *size, int *clock, int *invert, int *s
         prnt("DEBUG PSK: firstFullWave: %u, waveLen: %u, startIdx %i", firstFullWave, fullWaveLen, *startIdx);
         prnt("DEBUG PSK: clk: %d, lastClkBit: %u, fc: %u", *clock, lastClkBit, fc);
     }
-    
+
     waveStart = 0;
     dest[numBits++] = curPhase; //set first read bit
     for (i = firstFullWave + fullWaveLen - 1; i < *size - 3; i++) {