Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r11fcfaffab49f00f358124c8c285a821632eba24 -r27dab35610123b728c64b9db11967c95a45a2b01
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 11fcfaffab49f00f358124c8c285a821632eba24)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 27dab35610123b728c64b9db11967c95a45a2b01)
@@ -124,7 +124,6 @@
  *************************************************************************/
 void initConductivitySensors( void )
 {
-    /// TODO: Revert back to init state.
     currentConductivityState = CONDUCTIVITY_INIT_STATE;
     CONDUCTIVITY_SENSORS_T sensor;
 
@@ -195,6 +194,7 @@
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_D74_COND_SENSOR, ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_P9_COND_SENSOR, ALARM_ID_FP_P9_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_P18_COND_SENSOR, ALARM_ID_FP_P18_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
+
 }
 
 /*********************************************************************//**
@@ -356,7 +356,6 @@
     // Check which counter, assign it, and assign read bool to TRUE per sensor
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
-
         if ( FALSE == conductivitySensorStatus[ sensor ].haveAllCalSlotsBeenRead )
         {
 
@@ -903,6 +902,7 @@
         alpha = conductivitySensorCoefficients[ sensorNum ].alpha_high;
         k = conductivitySensorCoefficients[ sensorNum ].K_high;
     }
+
     calculateResistance( sensorNum, isFPSensor );
     calculateTemperature( sensorNum );
 
@@ -1178,4 +1178,5 @@
     return result;
 }
 
+
 /**@}*/