diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 04d253064..ca8115670 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1538,7 +1538,6 @@ void menuModelSetup(event_t event)
       }
 #endif
 
-
 #if 0
       case ITEM_MODEL_SETUP_PPM2_PROTOCOL:
         lcdDrawTextAlignedLeft(y, "Port2");
diff --git a/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp b/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp
index 2c537d242..17a68c8bd 100644
--- a/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp
+++ b/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp
@@ -341,8 +341,7 @@ void modelSetupModulePxx2ReceiverLine(uint8_t moduleIdx, uint8_t receiverIdx, co
     }
   }
 
-  if (attr && EVT_KEY_MASK(event) == KEY_ENTER) {
-    killEvents(event);
+  if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
     POPUP_MENU_ADD_ITEM(STR_BIND);
     POPUP_MENU_ADD_ITEM(STR_OPTIONS);
     POPUP_MENU_ADD_ITEM(STR_SHARE);
diff --git a/radio/src/gui/navigation/navigation_9x.cpp b/radio/src/gui/navigation/navigation_9x.cpp
index 9e2eb5f6b..bbc958c63 100644
--- a/radio/src/gui/navigation/navigation_9x.cpp
+++ b/radio/src/gui/navigation/navigation_9x.cpp
@@ -242,8 +242,7 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t
 
   }
 
-  switch (event)
-  {
+  switch (event) {
     case EVT_ENTRY:
       menuEntryTime = get_tmr10ms();
       l_posVert = 0;
@@ -271,7 +270,7 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t
     case EVT_KEY_FIRST(KEY_ENTER):
       if (!menuTab || l_posVert>0) {
         if (READ_ONLY_UNLOCKED()) {
-          s_editMode = (s_editMode<=0);
+          s_editMode = (s_editMode <= 0);
         }
       }
       break;
@@ -287,6 +286,7 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t
       }
       // no break
 #endif
+
     case EVT_KEY_LONG(KEY_EXIT):
       s_editMode = 0; // TODO needed? we call ENTRY_UP after which does the same
       popMenu();
diff --git a/radio/src/gui/navigation/navigation_x7.cpp b/radio/src/gui/navigation/navigation_x7.cpp
index 09e460d0c..d4b2b1f1b 100644
--- a/radio/src/gui/navigation/navigation_x7.cpp
+++ b/radio/src/gui/navigation/navigation_x7.cpp
@@ -262,7 +262,8 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, uint8_t
       break;
 
     case EVT_ROTARY_BREAK:
-      if (s_editMode > 1) break;
+      if (s_editMode > 1)
+        break;
       if (menuHorizontalPosition < 0 && maxcol > 0 && READ_ONLY_UNLOCKED()) {
         l_posHorz = 0;
         AUDIO_KEY_PRESS();
diff --git a/radio/src/gui/navigation/navigation_x9d.cpp b/radio/src/gui/navigation/navigation_x9d.cpp
index 405e4a26d..0018ad063 100644
--- a/radio/src/gui/navigation/navigation_x9d.cpp
+++ b/radio/src/gui/navigation/navigation_x9d.cpp
@@ -373,7 +373,8 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t
       break;
 
     case EVT_KEY_BREAK(KEY_ENTER):
-      if (s_editMode > 1) break;
+      if (s_editMode > 1) 
+        break;
       if (menuHorizontalPosition < 0 && maxcol > 0 && READ_ONLY_UNLOCKED()) {
         l_posHorz = 0;
         AUDIO_KEY_PRESS();
diff --git a/radio/src/gui/navigation/navigation_xlite.cpp b/radio/src/gui/navigation/navigation_xlite.cpp
index 6513b35bb..9cbafda8b 100644
--- a/radio/src/gui/navigation/navigation_xlite.cpp
+++ b/radio/src/gui/navigation/navigation_xlite.cpp
@@ -145,7 +145,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla
     }
   }
 
-  if (!READ_ONLY() && i_min==0 && i_max==1 && (event==EVT_KEY_BREAK(KEY_ENTER))) {
+  if (!READ_ONLY() && i_min == 0 && i_max == 1 && event == EVT_KEY_BREAK(KEY_ENTER)) {
     s_editMode = 0;
     newval = !val;
   }
@@ -318,8 +318,7 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t
     drawScreenIndex(curr, menuTabSize, attr);
   }
 
-  switch (event)
-  {
+  switch (event) {
     case EVT_ENTRY:
       menuEntryTime = get_tmr10ms();
       l_posVert = 0;
diff --git a/radio/src/pulses/pulses.h b/radio/src/pulses/pulses.h
index d583157fb..e2000c310 100644
--- a/radio/src/pulses/pulses.h
+++ b/radio/src/pulses/pulses.h
@@ -152,15 +152,6 @@ class OtaUpdateInformation: public BindInformation {
 
 typedef void (* ModuleCallback)();
 
-#if defined(SIMU)
-  #define BIND_INFO \
-    bindInformation->candidateReceiversCount = 2; \
-    strcpy(bindInformation->candidateReceiversNames[0], "SimuRX1"); \
-    strcpy(bindInformation->candidateReceiversNames[1], "SimuRX2"); 
-#else
-  #define BIND_INFO
-#endif
-
 PACK(struct ModuleState {
   uint8_t protocol:4;
   uint8_t mode:4;
@@ -181,7 +172,11 @@ PACK(struct ModuleState {
     bindInformation = destination;
     callback = bindCallback;
     mode = MODULE_MODE_BIND;
-    BIND_INFO;
+#if defined(SIMU)
+     bindInformation->candidateReceiversCount = 2;
+     strcpy(bindInformation->candidateReceiversNames[0], "SimuRX1");
+     strcpy(bindInformation->candidateReceiversNames[1], "SimuRX2");
+#endif
   }
   void readModuleInformation(ModuleInformation * destination, int8_t first, int8_t last)
   {