Index: firmware/App/Services/TDInterface.c
===================================================================
diff -u -r2e284dbe59e4fc8398b9d8c037a0da241ae99064 -rc90fd723edae06c0cd1c709ef42c7ab3ad52b749
--- firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 2e284dbe59e4fc8398b9d8c037a0da241ae99064)
+++ firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision c90fd723edae06c0cd1c709ef42c7ab3ad52b749)
@@ -55,30 +55,31 @@
 #define TD_BICARB_TYPE_MIN                  ( 0U )                                   ///< TD Min bicarb type index
 #define TD_BICARB_TYPE_MAX                  ( (U32)( NUM_OF_BICARB_TYPE - 1U ) )     ///< TD Max bicarb type index
 
-typedef enum
+/// Enumeration of TD Treatment Overrides
+typedef enum TD_Treatment_Override
 {
    TD_TREATMENT_OVERRIDE_DIALYSATE_FLOWRATE = 0,                           ///< TD Dialysate flow rate
    TD_TREATMENT_OVERRIDE_UF_RATE,                                          ///< TD Ultrafilteration rate
    TD_TREATMENT_OVERRIDE_DIALYSATE_TEMP,                                   ///< TD Target Dialysate Temperature
    TD_TREATMENT_OVERRIDE_ACID_TYPE,                                        ///< TD Acid type
    TD_TREATMENT_OVERRIDE_BICARB_TYPE,                                      ///< TD Bicarb type
-   TD_TREATMENT_OVERRIDE_PARAM_COUNT                                       ///< Number of TD override treatment parameters
+   NUM_OF_TD_TREATMENT_OVERRIDES,                                          ///< Number of TD override treatment parameters
 } TD_TREATMENT_OVERRIDE_INDEX_T;
 
 // ********** private data **********
 
 // TD status
-static TD_OP_MODE_T tdCurrentOpMode;                                        ///< Current TD operation mode.
-static U32 tdSubMode;                                                       ///< Current state (sub-mode) of current TD operation mode.
-static BOOL tdDialyzerBypass;                                               ///< TD dialyzer bypass
+static TD_OP_MODE_T tdCurrentOpMode;                                       ///< Current TD operation mode.
+static U32 tdSubMode;                                                      ///< Current state (sub-mode) of current TD operation mode.
+static BOOL tdDialyzerBypass;                                              ///< TD dialyzer bypass
 
-static BOOL tdOpModeDataFreshFlag = FALSE;                                  ///< Flag to signal/process fresh TD op mode data
+static BOOL tdOpModeDataFreshFlag = FALSE;                                 ///< Flag to signal/process fresh TD op mode data
 
-static OVERRIDE_F32_T tdDialysateFlowrate;                                 ///< TD override Dialysate flow rate
-static OVERRIDE_F32_T tdUFRate;                                            ///< TD override ultrafiltration rate
-static OVERRIDE_F32_T tdDialysateTemp;                                     ///< TD override Target Dialysate Temperature
-static OVERRIDE_U32_T tdAcidType;                                          ///< TD override Acid type
-static OVERRIDE_U32_T tdBicarbType;                                        ///< TD override Bicarb type
+static OVERRIDE_F32_T tdDialysateFlowrate;                                 ///< TD Dialysate flow rate
+static OVERRIDE_F32_T tdUFRate;                                            ///< TD ultrafiltration rate
+static OVERRIDE_F32_T tdDialysateTemp;                                     ///< TD Target Dialysate Temperature
+static OVERRIDE_U32_T tdAcidType;                                          ///< TD Acid type
+static OVERRIDE_U32_T tdBicarbType;                                        ///< TD Bicarb type
 
 // ********** private function prototypes **********
 
@@ -99,7 +100,7 @@
     tdDialyzerBypass               = FALSE;
     tdOpModeDataFreshFlag          = FALSE;
 
-    // Initialize overrides
+    // Initialize treatment parameters from TD
     tdDialysateFlowrate.data       = 0.0F;
     tdDialysateFlowrate.ovData     = 0.0F;
     tdDialysateFlowrate.ovInitData = TD_DIALYSATE_FLOWRATE_MIN_ML_MIN;
@@ -358,6 +359,7 @@
 DD_ACID_TYPES_T getTDAcidConcentrateType( void )
 {
     U32 value = getU32OverrideValue( &tdAcidType );
+
     return (DD_ACID_TYPES_T)value;
 }
 
@@ -372,6 +374,7 @@
 DD_BICARB_TYPES_T getTDBicarbConcentrateType( void )
 {
     U32 value = getU32OverrideValue( &tdBicarbType );
+
     return (DD_BICARB_TYPES_T)value;
 }