diff --git a/radio/src/eeprom_raw.h b/radio/src/eeprom_raw.h
index d4bd3459b..8a73d74eb 100644
--- a/radio/src/eeprom_raw.h
+++ b/radio/src/eeprom_raw.h
@@ -76,6 +76,10 @@ enum EepromWriteState {
 };
 
 extern EepromWriteState eepromWriteState;
+inline bool eepromIsWriting()
+{
+  return (eepromWriteState != EEPROM_IDLE);
+}
 void eepromWriteProcess();
 void eepromWriteWait(EepromWriteState state = EEPROM_IDLE);
 bool eepromOpen();
diff --git a/radio/src/eeprom_rlc.cpp b/radio/src/eeprom_rlc.cpp
index 008d29662..83958b63b 100644
--- a/radio/src/eeprom_rlc.cpp
+++ b/radio/src/eeprom_rlc.cpp
@@ -709,7 +709,7 @@ const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name)
 
   f_close(&g_oLogFile);
 
-#if defined(CPUARM)
+#if defined(PCBTARANIS)
   if (version < EEPROM_VER) {
     eeCheck(true);
     ConvertModel(i_fileDst, version);
@@ -910,11 +910,12 @@ bool eeLoadGeneral()
     }
   }
 
-#if defined(CPUARM)
+#if defined(PCBTARANIS)
   if (g_eeGeneral.version != EEPROM_VER) {
     TRACE("EEPROM version %d instead of %d", g_eeGeneral.version, EEPROM_VER);
-    if (!eeConvert())
+    if (!eeConvert()) {
       return false;
+    }
   }
   return true;
 #else
diff --git a/radio/src/eeprom_rlc.h b/radio/src/eeprom_rlc.h
index 2867b7259..f860930b0 100644
--- a/radio/src/eeprom_rlc.h
+++ b/radio/src/eeprom_rlc.h
@@ -79,9 +79,9 @@ PACK(struct DirEnt {
 });
 
 #if defined(CPUARM)
-#define EEFS_EXTRA_FIELDS uint8_t  spare[2];
+  #define EEFS_EXTRA_FIELDS uint8_t  spare[2];
 #else
-#define EEFS_EXTRA_FIELDS
+  #define EEFS_EXTRA_FIELDS
 #endif
 
 PACK(struct EeFs {
@@ -217,7 +217,20 @@ class RlcFile: public EFile
 
 extern RlcFile theFile;  //used for any file operation
 
-inline void eeFlush() { theFile.flush(); }
+inline void eeFlush()
+{
+  theFile.flush();
+}
+
+inline bool eepromIsWriting()
+{
+  return theFile.isWriting();
+}
+
+inline void eepromWriteProcess()
+{
+  theFile.nextWriteStep();
+}
 
 #if defined (EEPROM_PROGRESS_BAR)
 #define DISPLAY_PROGRESS_BAR(x) theFile.DisplayProgressBar(x)
diff --git a/radio/src/main_arm.cpp b/radio/src/main_arm.cpp
index 2988cb34e..cc733c351 100644
--- a/radio/src/main_arm.cpp
+++ b/radio/src/main_arm.cpp
@@ -81,18 +81,10 @@ void checkSpeakerVolume()
 void checkEeprom()
 {
   if (!usbPlugged()) {
-    // TODO merge these 2 branches
-#if defined(PCBSKY9X)
-    if (eepromWriteState != EEPROM_IDLE)
+    if (eepromIsWriting())
       eepromWriteProcess();
     else if (TIME_TO_WRITE())
       eeCheck(false);
-#else
-    if (theFile.isWriting())
-      theFile.nextWriteStep();
-    else if (TIME_TO_WRITE())
-      eeCheck(false);
-#endif
   }
 }