diff --git a/radio/src/gui/128x64/startup_shutdown.cpp b/radio/src/gui/128x64/startup_shutdown.cpp
index b12bc8fa8..96f9dbaea 100644
--- a/radio/src/gui/128x64/startup_shutdown.cpp
+++ b/radio/src/gui/128x64/startup_shutdown.cpp
@@ -30,7 +30,8 @@ const unsigned char bmp_sleep[]  = {
 
 void drawStartupAnimation(uint32_t duration, uint32_t totalDuration)
 {
-  if (totalDuration == 0) return;
+  if (totalDuration == 0)
+    return;
 
   uint8_t index = limit<uint8_t>(0, duration / (totalDuration / 5), 4);
 
@@ -49,7 +50,8 @@ void drawStartupAnimation(uint32_t duration, uint32_t totalDuration)
 
 void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration, const char * message)
 {
-  if (totalDuration == 0) return;
+  if (totalDuration == 0)
+    return;
 
   uint8_t index = limit<uint8_t>(0, duration / (totalDuration / 5), 4);
 
diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp
index 2eedcc884..c4848fe9f 100644
--- a/radio/src/gui/212x64/radio_setup.cpp
+++ b/radio/src/gui/212x64/radio_setup.cpp
@@ -471,13 +471,13 @@ void menuRadioSetup(event_t event)
 #endif
 
 #if defined(PWR_BUTTON_PRESS)
-    case ITEM_RADIO_SETUP_PWR_ON_SPEED:
+      case ITEM_RADIO_SETUP_PWR_ON_SPEED:
         lcdDrawTextAlignedLeft(y, STR_PWR_ON_SPEED);
         lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.pwrOnSpeed + 1, attr|LEFT);
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.pwrOnSpeed, -1, 2);
         break;
 
-    case ITEM_RADIO_SETUP_PWR_OFF_SPEED:
+      case ITEM_RADIO_SETUP_PWR_OFF_SPEED:
         lcdDrawTextAlignedLeft(y, STR_PWR_OFF_SPEED);
         lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.pwrOffSpeed + 1, attr|LEFT);
         if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.pwrOffSpeed, -1, 2);
diff --git a/radio/src/gui/212x64/startup_shutdown.cpp b/radio/src/gui/212x64/startup_shutdown.cpp
index e739b3754..6b039ed71 100644
--- a/radio/src/gui/212x64/startup_shutdown.cpp
+++ b/radio/src/gui/212x64/startup_shutdown.cpp
@@ -42,7 +42,8 @@ const unsigned char bmp_sleep[] = {
 
 void drawStartupAnimation(uint32_t duration, uint32_t totalDuration)
 {
-  if (totalDuration == 0) return;
+  if (totalDuration == 0)
+    return;
 
   uint8_t index = limit<uint8_t>(0, duration / (totalDuration / 5), 4);
 
@@ -59,7 +60,8 @@ void drawStartupAnimation(uint32_t duration, uint32_t totalDuration)
 
 void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration, const char * message)
 {
-  if (totalDuration == 0) return;
+  if (totalDuration == 0)
+    return;
 
   uint8_t index = limit<uint8_t>(0, duration / (totalDuration / 4), 3);
 
diff --git a/radio/src/gui/480x272/widgets.cpp b/radio/src/gui/480x272/widgets.cpp
index 4696c851b..301fe575b 100644
--- a/radio/src/gui/480x272/widgets.cpp
+++ b/radio/src/gui/480x272/widgets.cpp
@@ -393,7 +393,8 @@ void drawSleepBitmap()
 #define SHUTDOWN_CIRCLE_DIAMETER       150
 void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration, const char * message)
 {
-  if (totalDuration == 0) return;
+  if (totalDuration == 0)
+    return;
   
   static uint32_t lastDuration = 0xffffffff;
   static const BitmapBuffer * shutdown = BitmapBuffer::load(getThemePath("shutdown.bmp"));
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 186bc43da..4905906ba 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1731,8 +1731,12 @@ void copyTrimsToOffset(uint8_t ch)
 
 #if defined(STARTUP_ANIMATION)
 
-#define PWR_PRESS_DURATION_MIN() (2 - g_eeGeneral.pwrOnSpeed)
-#define PWR_PRESS_DURATION_MAX   500 // 5s
+inline uint32_t PWR_PRESS_DURATION_MIN()
+{
+  return 2 - g_eeGeneral.pwrOnSpeed;
+}
+
+constexpr uint32_t PWR_PRESS_DURATION_MAX = 500; // 5s
 
 void runStartupAnimation()
 {
@@ -2028,7 +2032,10 @@ int main()
 #if !defined(SIMU)
 #if defined(PWR_BUTTON_PRESS)
 
-#define PWR_PRESS_SHUTDOWN_DELAY() (2 - g_eeGeneral.pwrOffSpeed)
+inline uint32_t PWR_PRESS_SHUTDOWN_DELAY()
+{
+  return 2 - g_eeGeneral.pwrOffSpeed;
+}
 
 uint32_t pwr_press_time = 0;