Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r9488cd55cd4ed1680a6e2d87c178a994e35b8c78 -rc7471bcaa802b31c4af8f4e7879f5632d946b357
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 9488cd55cd4ed1680a6e2d87c178a994e35b8c78)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision c7471bcaa802b31c4af8f4e7879f5632d946b357)
@@ -542,7 +542,6 @@
 
     switch ( board )
     {
-        // TODO should check Rx FIFO to see if a character exists?
         case EMSTAT_CPI_CPO_BOARD:
             // Check for continuous incoming bytes
             rxFifoCount = getFPGAEmstatCPiCPoRxFifoCount() & EMSTAT_RX_FIFO_COUNT_MASK;
@@ -613,7 +612,7 @@
         default:
             if ( TRUE == readPackage->packageStarted )
             {
-                if (readPackage->packageIndex < EMSTAT_PACKAGE_BUFFER_SIZE )
+                if ( readPackage->packageIndex < EMSTAT_PACKAGE_BUFFER_SIZE )
                 {
                     readPackage->package[ readPackage->packageIndex++ ] = emstatByte;
                 }
@@ -675,7 +674,7 @@
     {
         if ( ++condSensorStatus[ sensorId ].internalErrorCount > MAX_CONDUCTIVITY_SENSOR_FAILURES )
         {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, sensorId, condSensorStatus[ sensorId ].sensorStatus  );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_CONDUCTIVITY_SENSOR_FAULT, sensorId, condSensorStatus[ sensorId ].sensorStatus );
         }
     }
     else