Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rdd8c7304a6f366e4815facd247700ea00d26c7ca -rdcbd821e41803adc6e582d909207bc97f85ff939
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision dd8c7304a6f366e4815facd247700ea00d26c7ca)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision dcbd821e41803adc6e582d909207bc97f85ff939)
@@ -14,8 +14,6 @@
  *
  **************************************************************************/
 
-//leo-del #include <Controllers/AlarmLamp.h>
-//leo-del #include <Controllers/Buttons.h>
 #include "ModeFill.h"
 #include "Common.h"
 #include "OperationModes.h"
@@ -26,7 +24,8 @@
 #endif
 
 // ********** private data **********
-static volatile enum FillModeSubModes {
+static volatile enum FillModeSubModes
+{
     CHECK_INLET_WATER = 0,
     CREATE_PRODUCT_WATER,
     DIALYSATE_PRODUCTION,
@@ -91,7 +90,8 @@
         case CHECK_INLET_WATER:
 
             // We check every half second to toggle LED
-            if (TRUE == didTimeout(timer, QUARTER_SECOND)) {
+            if (TRUE == didTimeout(timer, QUARTER_SECOND))
+            {
 
                 timer = getMSTimerCount(); // Reset timer
                 #ifdef RM46_EVAL_BOARD_TARGET
@@ -100,7 +100,8 @@
                 toggle_counter++;
             }
 
-            if (toggle_counter == 8) {
+            if (toggle_counter == 8)
+            {
                 toggle_counter = 0;
 
                 // switch to submode
@@ -112,7 +113,8 @@
         case CREATE_PRODUCT_WATER:
 
             // We check every half second to toggle LED
-            if (TRUE == didTimeout(timer, HALF_SECOND)) {
+            if (TRUE == didTimeout(timer, HALF_SECOND))
+            {
 
                 timer = getMSTimerCount(); // Reset timer
                 #ifdef RM46_EVAL_BOARD_TARGET
@@ -121,7 +123,8 @@
                 toggle_counter++;
             }
 
-            if (toggle_counter == 4) {
+            if (toggle_counter == 4)
+            {
                 toggle_counter = 0;
 
                 // switch to submode
@@ -131,7 +134,8 @@
 
         case DIALYSATE_PRODUCTION:
             // We check every half second to toggle LED
-            if (TRUE == didTimeout(timer, HALF_SECOND + QUARTER_SECOND)) {
+            if (TRUE == didTimeout(timer, HALF_SECOND + QUARTER_SECOND))
+            {
 
                 timer = getMSTimerCount(); // Reset timer
                 #ifdef RM46_EVAL_BOARD_TARGET
@@ -140,7 +144,8 @@
                 toggle_counter++;
             }
 
-            if (toggle_counter == 4) {
+            if (toggle_counter == 4)
+            {
                 toggle_counter = 0;
 
                 // switch to submode
@@ -150,7 +155,8 @@
 
         case DELIVER_DIALYSATE:
 
-            if(toggle_counter == 0) {
+            if(toggle_counter == 0)
+            {
                 #ifdef RM46_EVAL_BOARD_TARGET
                     setUserLED(TRUE);
                 #endif