Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62 -r2505e43eaab426e0de49f67ebb9b78efcfd13f55
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 2505e43eaab426e0de49f67ebb9b78efcfd13f55)
@@ -54,7 +54,8 @@
 // ********** private data **********
 
 /// Conductivity sensors' associated temperature sensors
-static U32 associateTempSensor[ NUM_OF_CONDUCTIVITY_SENSORS ] = {
+static U32 associateTempSensor[ NUM_OF_CONDUCTIVITY_SENSORS ] =
+{
      TEMPSENSORS_INLET_PRIMARY_HEATER,                                                              ///< Inlet temperature sensor
      TEMPSENSORS_OUTLET_PRIMARY_HEATER,                                                             ///< Outlet temperature sensor
 };
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62 -r2505e43eaab426e0de49f67ebb9b78efcfd13f55
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 2505e43eaab426e0de49f67ebb9b78efcfd13f55)
@@ -131,7 +131,8 @@
 static const F32 positiveTCExpA2 = 0.126968600000E3;                                               ///< K TC positive temperature exponent coefficient A2.
 
 ///< Thermocouple correction coefficients for positive cold junction temperature.
-static const F32 positiveTCCoeffs [ SIZE_OF_THERMOCOUPLE_COEFFICIENTS ] = {
+static const F32 positiveTCCoeffs [ SIZE_OF_THERMOCOUPLE_COEFFICIENTS ] =
+{
     -0.176004136860E-1, 0.389212049750E-1,
     0.185587700320E-4, -0.994575928740E-7,
     0.318409457190E-9, -0.560728448890E-12,
@@ -140,7 +141,8 @@
 };
 
 ///< Thermcouple inverse coefficient for positive cold junction temperature.
-static const F32 positiveTCInverserCoeffs [ SIZE_OF_THERMOCOUPLE_COEFFICIENTS ] = {
+static const F32 positiveTCInverserCoeffs [ SIZE_OF_THERMOCOUPLE_COEFFICIENTS ] =
+{
     0.0, 2.508355E1, 7.860106E-2, -2.503131E-1, 8.315270E-2,
     -1.228034E-2, 9.804036E-4, -4.413030E-5, 1.057734E-6, -1.052755E-8
 };
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r44c977966ab7cfecbfbf5110e6abe4ec45ebab62 -r2505e43eaab426e0de49f67ebb9b78efcfd13f55
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 44c977966ab7cfecbfbf5110e6abe4ec45ebab62)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 2505e43eaab426e0de49f67ebb9b78efcfd13f55)
@@ -284,6 +284,7 @@
     {
         activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT );
     }
+
     return result;
 }
 
Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -r5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1 -r2505e43eaab426e0de49f67ebb9b78efcfd13f55
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 2505e43eaab426e0de49f67ebb9b78efcfd13f55)
@@ -260,7 +260,7 @@
  * Do not call this function with a "len" longer than what is currently in the buffer.
  * @details
  * Inputs : commBuffers[], commBufferByteCount[], activeDoubleBuffer[]
- * Outputs : given array populated with requested # of bytes from the buffer.
+ * Outputs : given array populated with requested number of bytes from the buffer.
  * @param buffer which comm buffer to retrieve data from
  * @param data pointer to byte array to stuff data into
  * @param len number of bytes to retrieve into given data array.
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1 -r2505e43eaab426e0de49f67ebb9b78efcfd13f55
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 2505e43eaab426e0de49f67ebb9b78efcfd13f55)
@@ -723,7 +723,7 @@
  * write command to the FPGA.
  * @details
  * Inputs : none
- * Outputs : # of bytes for next FPGA write command is set
+ * Outputs : number of bytes for next FPGA write command is set
  * @param bytes2Transmit number of bytes to be transmitted via DMA to the FPGA.
  * @return none
  *************************************************************************/
@@ -1425,7 +1425,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaCPiFault
  * Outputs : none
- * @param none
  * @return Latest CPi conductivity sensor fault
  *************************************************************************/
 U08 getFPGACPiFault( void )
@@ -1439,7 +1438,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaCPiReadCnt
  * Outputs : none
- * @param none
  * @return Latest CPi conductivity sensor read count
  *************************************************************************/
 U08 getFPGACPiReadCount( void )
@@ -1453,7 +1451,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaCPiErrorCnt
  * Outputs : none
- * @param none
  * @return Latest CPi conductivity sensor read error count
  *************************************************************************/
 U08 getFPGACPiErrorCount( void )
@@ -1467,7 +1464,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaCPi
  * Outputs : none
- * @param none
  * @return Latest CPi conductivity sensor value
  *************************************************************************/
 U32 getFPGACPi( void )
@@ -1481,7 +1477,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaCPoFault
  * Outputs : none
- * @param none
  * @return Latest CPo sensor fault
  *************************************************************************/
 U08 getFPGACPoFault( void )
@@ -1495,7 +1490,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaCPoReadCnt
  * Outputs : none
- * @param none
  * @return Latest CPo conductivity sensor read count
  *************************************************************************/
 U08 getFPGACPoReadCount( void )
@@ -1510,7 +1504,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaCPoErrorCnt
  * Outputs : none
- * @param none
  * @return Latest CPo conductivity sensor read error count
  *************************************************************************/
 U08 getFPGACPoErrorCount( void )
@@ -1524,7 +1517,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaCPo
  * Outputs : none
- * @param none
  * @return Latest CPo conductivity sensor value
  *************************************************************************/
 U32 getFPGACPo( void )
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1 -r2505e43eaab426e0de49f67ebb9b78efcfd13f55
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2505e43eaab426e0de49f67ebb9b78efcfd13f55)
@@ -553,7 +553,7 @@
  * @details
  * Inputs : Output CAN Comm Buffers
  * Outputs : CAN packet transmit initiated.
- * @return # of bytes transmitted
+ * @return number of bytes transmitted
  *************************************************************************/
 static U32 transmitNextCANPacket( void )
 {
@@ -603,7 +603,7 @@
  * @details
  * Inputs : Output UART Comm Buffer(s)
  * Outputs : UART DMA transmit initiated.
- * @return # of bytes transmitted
+ * @return number of bytes transmitted
  *************************************************************************/
 #ifdef DEBUG_ENABLED
 static U32 transmitNextUARTPacket( void )