Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r7aa0c684cca238a9697867ff72e5c3f5f2edb379 -r323024b3c7b988f4da87d3e5ef54f395db1142f8
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 7aa0c684cca238a9697867ff72e5c3f5f2edb379)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 323024b3c7b988f4da87d3e5ef54f395db1142f8)
@@ -722,12 +722,12 @@
             if ( D5_HEAT == heater )
             {
                 alarm       = ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D5_HEAT_IS_ON;
-                isLevelLow  = ( ( getFloaterStatus( D6_LEVL ) != 0 )? FALSE : TRUE );
+                isLevelLow  = ( ( getFloaterStatus( D6_LEVL ) != LVL_STATE_EMPTY )? FALSE : TRUE );
             }
             else
             {
                 alarm       = ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D45_HEAT_IS_ON;
-                isLevelLow  = ( ( getLevelStatus( D46_LEVL ) != 0 )? FALSE : TRUE );
+                isLevelLow  = ( ( getLevelStatus( D46_LEVL ) != LEVEL_STATE_LOW )? FALSE : TRUE );
             }
 
             checkPersistentAlarm( alarm, isLevelLow, 0.0F, 0.0F );
Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -r7aa0c684cca238a9697867ff72e5c3f5f2edb379 -r323024b3c7b988f4da87d3e5ef54f395db1142f8
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision 7aa0c684cca238a9697867ff72e5c3f5f2edb379)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision 323024b3c7b988f4da87d3e5ef54f395db1142f8)
@@ -28,7 +28,6 @@
  */
 
 // ********** private definitions **********
-#define LEVEL_SENSOR_VALUE_LOW              0U                                                      ///< Level sensor digital low value (0 = low, non-zero = high).
 #define LEVEL_SENSOR_LIQUID                 0U                                                      ///< Level sensor digital low value (0 = liquid, 1 =  no liquid).
 #define FPGA_B1_HW_LEVEL_LOW                5                                                       ///< Floater low level status for Beta 1.0
 #define FPGA_B1_HW_LEVEL_MEDIUM             4                                                       ///< Floater medium level status for Beta 1.0
@@ -85,7 +84,7 @@
  *************************************************************************/
 void initLevels( void )
 {
-    U32 i;
+    LEVEL_T level;
 
     levelsDataPublicationCounter                = DATA_PUBLISH_COUNTER_START_COUNT;
     fplevelsDataPublishInterval.data            = LEVEL_DATA_PUB_INTERVAL;
@@ -98,15 +97,15 @@
     levelsDataPublishInterval.override          = OVERRIDE_RESET;
 
     // Initialize all the Level
-    for ( i = 0; i < NUM_OF_LEVELS; i++ )
+    for ( level = FIRST_LEVEL; level < NUM_OF_LEVELS; level++ )
     {
-        status[ i ].data                    = (U32)LEVEL_STATE_HIGH;
-        status[ i ].ovData                  = (U32)LEVEL_STATE_HIGH;
-        status[ i ].ovInitData              = (U32)LEVEL_STATE_HIGH;
-        status[ i ].override                = OVERRIDE_RESET;
-        levelsStatus[ i ].debounceStartTime = 0;
-        levelsStatus[ i ].debounceTime      = LEVEL_DEBOUNCE_TIME_MS;
-        levelsStatus[ i ].priorRawLevel     = (U32)LEVEL_STATE_HIGH;
+        status[ level ].data                    = (U32)LEVEL_STATE_HIGH;
+        status[ level ].ovData                  = (U32)LEVEL_STATE_HIGH;
+        status[ level ].ovInitData              = (U32)LEVEL_STATE_HIGH;
+        status[ level ].override                = OVERRIDE_RESET;
+        levelsStatus[ level ].debounceStartTime = 0;
+        levelsStatus[ level ].debounceTime      = LEVEL_DEBOUNCE_TIME_MS;
+        levelsStatus[ level ].priorRawLevel     = (U32)LEVEL_STATE_HIGH;
     }
 }
 
@@ -127,7 +126,7 @@
     for ( level = FIRST_LEVEL; level < NUM_OF_LEVELS; level++ )
     {
         // Get the current level status
-        switch (level )
+        switch ( level )
         {
             // Process the status of the Level
             case D6_LEVL:
@@ -223,7 +222,7 @@
             levelsStatus[ level ].debounceStartTime = 0;
         }
 
-        levelsStatus[level].priorRawLevel = currentLevelStatus;
+        levelsStatus[ level ].priorRawLevel = currentLevelStatus;
     }
 
     publishLevelsData();
@@ -293,7 +292,6 @@
     return (LVL_STATE_T)stat;
 }
 
-
 /*********************************************************************//**
  * @brief
  * The processLevelCount function checks the range of count reported by FPGA
@@ -503,27 +501,27 @@
 {
     LVL_STATE_T status = LVL_STATE_ILLEGAL;
 
-   LEVEL_STATE_T upperlevel = getLevelStatus( D98_LEVL );
-   LEVEL_STATE_T lowerlevel = getLevelStatus( D63_LEVL );
+    LEVEL_STATE_T upperlevel = getLevelStatus( D98_LEVL );
+    LEVEL_STATE_T lowerlevel = getLevelStatus( D63_LEVL );
 
-   if ( ( lowerlevel == LEVEL_STATE_LOW ) && ( upperlevel == LEVEL_STATE_LOW ) )
-   {
-       status =LVL_STATE_LOW;
-   }
-   else if ( ( lowerlevel == LEVEL_STATE_HIGH ) && ( upperlevel == LEVEL_STATE_LOW ) )
-   {
-       status = LVL_STATE_MEDIUM;
-   }
-   else if ( ( lowerlevel == LEVEL_STATE_HIGH ) && ( upperlevel == LEVEL_STATE_HIGH ) )
-   {
-       status = LVL_STATE_HIGH;
-   }
-   else
-   {
-       // upperlevel == TRUE while lowerlevel == FALSE - illegal
-       status = LVL_STATE_ILLEGAL;
-   }
-   return status;
+    if ( ( lowerlevel == LEVEL_STATE_LOW ) && ( upperlevel == LEVEL_STATE_LOW ) )
+    {
+        status = LVL_STATE_LOW;
+    }
+    else if ( ( lowerlevel == LEVEL_STATE_HIGH ) && ( upperlevel == LEVEL_STATE_LOW ) )
+    {
+        status = LVL_STATE_MEDIUM;
+    }
+    else if ( ( lowerlevel == LEVEL_STATE_HIGH ) && ( upperlevel == LEVEL_STATE_HIGH ) )
+    {
+        status = LVL_STATE_HIGH;
+    }
+    else
+    {
+        // upperlevel == TRUE while lowerlevel == FALSE - illegal
+        status = LVL_STATE_ILLEGAL;
+    }
+    return status;
 }
 
 /*********************************************************************//**
Index: firmware/App/Monitors/Level.h
===================================================================
diff -u -r7aa0c684cca238a9697867ff72e5c3f5f2edb379 -r323024b3c7b988f4da87d3e5ef54f395db1142f8
--- firmware/App/Monitors/Level.h	(.../Level.h)	(revision 7aa0c684cca238a9697867ff72e5c3f5f2edb379)
+++ firmware/App/Monitors/Level.h	(.../Level.h)	(revision 323024b3c7b988f4da87d3e5ef54f395db1142f8)
@@ -71,8 +71,8 @@
 {
     U32 d6Level;                        ///< Floater level
     U32 d46Level;                       ///< Spent dialysate level
-    U32 d63Level;                       ///< Bicarb upper level
-    U32 d98Level;                       ///< Bicarb lower level
+    U32 d63Level;                       ///< Bicarb lower level
+    U32 d98Level;                       ///< Bicarb upper level
     U32 bicarbLevel;                    ///< Bicarb chamber level combination ( D63 + D98 )
 } DD_LEVEL_DATA_T;