Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r43ceadd4e906f44579de2a15d1201c5e7f7024ed -r2c260073fc636356eade30a28ae0b49bb2778ead
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 43ceadd4e906f44579de2a15d1201c5e7f7024ed)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 2c260073fc636356eade30a28ae0b49bb2778ead)
@@ -109,8 +109,8 @@
 static U32 getConductivitySensorErrorCount( CONDUCTIVITY_SENSORS_T sensor );
 static U32 getTemperatureSensorReadCount( CONDUCTIVITY_SENSORS_T sensor );
 static U32 getTemperatureSensorErrorCount( CONDUCTIVITY_SENSORS_T sensor );
-static BOOL monitorCalDataReads( U32 sensorId );
-static BOOL checkConductivityCoefficientRanges( U32 sensorId );
+static BOOL monitorCalDataReads( CONDUCTIVITY_SENSORS_T sensorId );
+static BOOL checkConductivityCoefficientRanges( CONDUCTIVITY_SENSORS_T sensorId );
 static void calculateConductivityUpdatedStandard( CONDUCTIVITY_SENSORS_T sensorNum, BOOL isFPSensor );
 static void calculateTemperature( CONDUCTIVITY_SENSORS_T sensorNum );
 static void calculateResistance( CONDUCTIVITY_SENSORS_T sensorNum, BOOL isFPSensor );
@@ -494,6 +494,7 @@
         // All cal data has been assigned and checks.
         state = CONDUCTIVITY_READ_DATA_STATE;
     }
+
     return state;
 }
 
@@ -528,6 +529,7 @@
 
         calculateConductivityUpdatedStandard( sensor, isFPSensor );
     }
+
     return state;
 }
 
@@ -587,7 +589,7 @@
  * @param sensor ID of the conductivity sensor.
  * @return True if all cal data has been read, false if not.
  *************************************************************************/
-static BOOL monitorCalDataReads( U32 sensorId )
+static BOOL monitorCalDataReads( CONDUCTIVITY_SENSORS_T sensorId )
 {
     BOOL result = TRUE;
     CONDUCTIVITY_CAL_IDX_T calIdx;
@@ -599,6 +601,7 @@
             result = FALSE;
         }
     }
+
     return result;
 }
 
@@ -611,7 +614,7 @@
  * @param sensor ID of the conductivity sensor.
  * @return True if all cal data is in range, false if not.
  *************************************************************************/
-static BOOL checkConductivityCoefficientRanges( U32 sensorId )
+static BOOL checkConductivityCoefficientRanges( CONDUCTIVITY_SENSORS_T sensorId )
 {
     BOOL result = TRUE;
     CONDUCTIVITY_CAL_IDX_T idx = CAL_DATA_1;
@@ -691,6 +694,7 @@
     {
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId, ( U32 )idx )
     }
+
     return result;
 }
 /*********************************************************************//**
@@ -1071,7 +1075,6 @@
             msgId = MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_RESPONSE;
             channelId = COMM_BUFFER_OUT_CAN_DD_BROADCAST;
             memcpy( &CondVersionRecord, &conductivitySensorRevisions[ condSensorId ], sizeof( CONDUCTIVITY_REVISIONS_T ) );
-
         }
         else
         {
@@ -1080,7 +1083,6 @@
             memcpy( &CondVersionRecord, &conductivitySensorRevisions[ condSensorId ], sizeof( CONDUCTIVITY_REVISIONS_T ) );
         }
         result = sendMessage( (MSG_ID_T)msgId, (COMM_BUFFER_T)channelId, (U08*)&CondVersionRecord, sizeof( CONDUCTIVITY_REVISIONS_T ) );
-
     }
 
     return result;
Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r43ceadd4e906f44579de2a15d1201c5e7f7024ed -r2c260073fc636356eade30a28ae0b49bb2778ead
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 43ceadd4e906f44579de2a15d1201c5e7f7024ed)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 2c260073fc636356eade30a28ae0b49bb2778ead)
@@ -246,7 +246,6 @@
 
         if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
         {
-
             if ( sensor != D74_COND )
             {
                 calculatedConductivity = getTeensyConductivityValue( sensor );