diff --git a/armsrc/Standalone/lf_em4100rswb.c b/armsrc/Standalone/lf_em4100rswb.c
index dd9fafd6a..14bab8357 100644
--- a/armsrc/Standalone/lf_em4100rswb.c
+++ b/armsrc/Standalone/lf_em4100rswb.c
@@ -39,7 +39,6 @@
 #include "proxmark3_arm.h"
 #include "appmain.h"
 #include "fpgaloader.h"
-#include "lfops.h"
 #include "util.h"
 #include "dbprint.h"
 #include "ticks.h"
@@ -48,6 +47,7 @@
 #include "spiffs.h"
 #include "inttypes.h"
 #include "parity.h"
+#include "lfops.h"
 
 #ifdef WITH_FLASH
 #include "flashmem.h"
@@ -68,16 +68,16 @@
 
 // Predefined bruteforce speed
 // avg: 1s, 1.2s, 1.5s, 2s
-int bruteforceSpeedCurrent = 1;
-int bruteforceSpeed[] = {10, 12, 14, 16};
+static int bruteforceSpeedCurrent = 1;
+static int bruteforceSpeed[] = {10, 12, 14, 16};
 
 // low & high - array for storage IDs. Its length must be equal.
 // Predefined IDs must be stored in low[].
 // In high[] must be nulls
-uint64_t low[] = {0, 0, 0, 0};
-uint32_t high[] = {0, 0, 0, 0};
-uint8_t *bba;
-int buflen;
+static uint64_t low[] = {0, 0, 0, 0};
+static uint32_t high[] = {0, 0, 0, 0};
+static uint8_t *bba;
+static int buflen;
 
 void ModInfo(void) {
     DbpString("  LF EM4100 read/sim/write/brute mode");
@@ -205,7 +205,7 @@ static void PrintFcAndCardNum(uint64_t lowData) {
     Dbprintf("[=] READ TAG ID: %"PRIx64" - FC: %u - Card: %u", lowData, fc, cardnum);
 }
 
-static int ButeEMTag(uint64_t originalCard, int slot) {
+static int BruteEMTag(uint64_t originalCard, int slot) {
     int speed_count = 4;
 
     int direction = 1;
@@ -256,7 +256,7 @@ static int ExecuteMode(int mode, int slot) {
         //default first mode is simulate
         case LF_RWSB_MODE_READ:
             Dbprintf("[=] >>  Read mode started  <<");
-            CmdEM410xdemod(1, &high[slot], &low[slot], 0);
+            lf_em410x_watch(1, &high[slot], &low[slot]);
             LED_Update(mode, slot);
             Dbprintf("[=] >>  Tag found. Saving. <<");
             FlashLEDs(100, 5);
@@ -272,11 +272,11 @@ static int ExecuteMode(int mode, int slot) {
             return LF_RWSB_UNKNOWN_RESULT;
         case LF_RWSB_MODE_WRITE:
             Dbprintf("[!!] >>  Write mode started  <<");
-            WriteEM410x(LF_RWSB_T55XX_TYPE, (uint32_t)(low[slot] >> 32), (uint32_t)(low[slot] & 0xffffffff));
+            copy_em410x_to_t55xx(LF_RWSB_T55XX_TYPE, LF_CLOCK, (uint32_t)(low[slot] >> 32), (uint32_t)(low[slot] & 0xffffffff));
             return LF_RWSB_UNKNOWN_RESULT;
         case LF_RWSB_MODE_BRUTE:
             Dbprintf("[=] >>  Bruteforce mode started  <<");
-            return ButeEMTag(low[slot], slot);
+            return BruteEMTag(low[slot], slot);
     }
     return LF_RWSB_UNKNOWN_RESULT;
 }