Index: NVDataMgmt.c
===================================================================
diff -u -racf23cc2f7d60625777583d890f0f1c936e7c3bf -r99e88d93753bbcdc25e2318351750cb0d2d4069e
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision acf23cc2f7d60625777583d890f0f1c936e7c3bf)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 99e88d93753bbcdc25e2318351750cb0d2d4069e)
@@ -123,6 +123,11 @@
 #define FLUSH_LINES_DEFAULT_VOLUME_L         0.01                                                               ///< Water volume to flush when starting re-circulate mode in liters.
 #define ACID_CONC_DEFAULT_MIXING_RATIO       ( 2.35618 / FRACTION_TO_PERCENT_FACTOR )                           ///< Ratio between RO water and acid concentrate mixing ratio.
 #define BICARB_CONC_DEFAULT_MIXING_RATIO     ( 4.06812 / FRACTION_TO_PERCENT_FACTOR )                           ///< Ratio between RO water and bicarbonate concentrate mixing ratio.
+#define PRES_SENSORS_RESERVED_SPACE_COUNT    6                                                                  ///< Pressure sensors reserved space count.
+#define FLOW_SENSROS_RESERVED_SPACE_COUNT    3                                                                  ///< Flow sensors reserved space count.
+#define TEMP_SENSORS_RESERVED_SPACE_COUNT    5                                                                  ///< Temperature sensors reserved space count.
+#define COND_SENSORS_RESERVED_SPACE_COUNT    2                                                                  ///< Conductivity sensors reserved space count.
+#define GENERIC_VOL_RESERVED_SPACE_COUNT     4                                                                  ///< Generic volumes reserved space count.
 #endif
 
 /// NVDataMgmt self-test states enumeration.
@@ -291,7 +296,7 @@
     DG_BICARB_CONCENTRATES_RECORD_T         bicarbConcentratesRecord;                                           ///< DG bicarb concentrates.
     DG_FILTERS_CAL_RECORD_T                 filtersRecord;                                                      ///< DG filters.
     DG_FANS_CAL_RECORD_T                    fansRecord;                                                         ///< DG fans.
-    DG_ACCEL_SENSOR_CAL_RECORD_T    accelerometerSensorCalRecord;                                       ///< DG accelerometer sensor.
+    DG_ACCEL_SENSOR_CAL_RECORD_T            accelerometerSensorCalRecord;                                       ///< DG accelerometer sensor.
 } DG_CALIBRATION_GROUPS_T;
 
 /// DG calibration records structure
@@ -3273,7 +3278,7 @@
         isCalRecordValid      = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
-    for ( i = 0; i < 6; i++ )
+    for ( i = 0; i < PRES_SENSORS_RESERVED_SPACE_COUNT; i++ )
         // Benign the pressures reserved spaces
         memcpy( (POLYNOMIAL_CAL_PAYLOAD_T*)&pressure->reservedSpace[ i ], &tempRecord, sizeof( POLYNOMIAL_CAL_PAYLOAD_T ) );
 
@@ -3285,7 +3290,7 @@
         isCalRecordValid      = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
-    for ( i = 0; i < 3; i++ )
+    for ( i = 0; i < FLOW_SENSROS_RESERVED_SPACE_COUNT; i++ )
         // Benign the the flow sensors reserved spaces
         memcpy( (POLYNOMIAL_CAL_PAYLOAD_T*)&flow->reservedSpace[ i ], &tempRecord, sizeof( POLYNOMIAL_CAL_PAYLOAD_T ) );
 
@@ -3305,7 +3310,7 @@
         isCalRecordValid      = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
-    for ( i = 0; i < 5; i++ )
+    for ( i = 0; i < TEMP_SENSORS_RESERVED_SPACE_COUNT; i++ )
         // Benign the temperature sensors reserved spaces
         memcpy( (POLYNOMIAL_CAL_PAYLOAD_T*)&temperature->reservedSpace[ i ], &tempRecord, sizeof( POLYNOMIAL_CAL_PAYLOAD_T ) );
 
@@ -3317,7 +3322,7 @@
         isCalRecordValid      = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
-    for ( i = 0; i < 2; i++ )
+    for ( i = 0; i < COND_SENSORS_RESERVED_SPACE_COUNT; i++ )
         // Benign the conductivity sensors reserved spaces
         memcpy( (POLYNOMIAL_CAL_PAYLOAD_T*)&cond->reservedSpace[ i ], &tempRecord, sizeof( POLYNOMIAL_CAL_PAYLOAD_T ) );
 
@@ -3352,7 +3357,7 @@
     }
 
     DG_GENERIC_VOLUME_RECORD_T* genericVol = &dgCalibrationRecord.dgCalibrationGroups.genericVolumeRecord;
-    for ( i = 0; i < 4; i++ )
+    for ( i = 0; i < GENERIC_VOL_RESERVED_SPACE_COUNT; i++ )
     {
         isHardwareRecordValid = isDGGenericVolRecordValid( &genericVol->genericVolume[ i ] );
         isCalRecordValid      = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;