Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r1281328075355359a89df86bb3f31a2e2e580b8b -r2e6fa609bde16c6e335cbea127ecfa7a6afad6c9
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 1281328075355359a89df86bb3f31a2e2e580b8b)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 2e6fa609bde16c6e335cbea127ecfa7a6afad6c9)
@@ -226,7 +226,7 @@
  *************************************************************************/
 void execDGInterfaceMonitor( void )
 {
-    if ( isACPowerLost() != TRUE )
+    if ( FALSE == isACPowerLost() )
     {
         // Trigger alarm if not receiving new load cell data message in timely manner
         checkDGDataFreshness( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, &dgLoadCellDataFreshFlag );
@@ -458,14 +458,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getDialysateTemperature function gets the latest dialysate temperature.
- * @details Inputs: dgDialysateTemp
+ * The getDGDisinfectsStates function returns the DG disinfects readings.
+ * @details Inputs: none
  * @details Outputs: none
- * @return the latest dialysate temperature
+ * @return the current DG disinfects readings
  *************************************************************************/
-F32 getDialysateTemperature( void )
+DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
 {
-    return dgDialysateTemp;
+    return disinfectsStatus;
 }
 
 /*********************************************************************//**
@@ -509,14 +509,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getDGDisinfectsStates function returns the DG disinfects readings.
- * @details Inputs: none
+ * The getDialysateTemperature function returns the DG dialysate temperature.
+ * @details Inputs: dgDialysateTemp
  * @details Outputs: none
- * @return the current DG disinfects readings
+ * @return the latest dialysate temperature
  *************************************************************************/
-DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
+F32 getDialysateTemperature( void )
 {
-    return disinfectsStatus;
+    return dgDialysateTemp;
 }
 
 /*********************************************************************//**
@@ -1310,7 +1310,7 @@
     U32 trimmerState  = dgHeatersData.trimmerHeaterState;
     DG_OP_MODE_T dgOp = getDGOpMode();
 
-    if ( isACPowerLost() != TRUE )
+    if ( FALSE == isACPowerLost() )
     {
         if ( ( DG_MODE_GENE == dgOp ) || ( DG_MODE_FILL == dgOp ) || ( DG_MODE_DRAI == dgOp ) )
         {