Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r74a9c045d2d045721baac1d15b618db450e7f775 -r777d38c1f794e05052f47c3ed1826487722e0335
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 74a9c045d2d045721baac1d15b618db450e7f775)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 777d38c1f794e05052f47c3ed1826487722e0335)
@@ -169,7 +169,8 @@
         }
 #endif
 #endif
-    }
+    }
+
     activateAlarm( alarm );
 }
 
@@ -203,7 +204,8 @@
         }
 #endif
 #endif
-    }
+    }
+
     activateAlarm( alarm );
 }
 
Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -r74a9c045d2d045721baac1d15b618db450e7f775 -r777d38c1f794e05052f47c3ed1826487722e0335
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 74a9c045d2d045721baac1d15b618db450e7f775)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 777d38c1f794e05052f47c3ed1826487722e0335)
@@ -119,8 +119,7 @@
         U32 currentActiveBufCount;  // where to start adding new data to buffer (after existing data)
 
         // prevent adding to out-going CAN buffer if DG is only node on CAN bus
-        if ( ( FALSE == isDGOnlyCANNode() ) ||
-             ( FALSE == isCANBoxForXmit( (CAN_MESSAGE_BOX_T)buffer ) ) )
+        if ( ( FALSE == isDGOnlyCANNode() ) || ( FALSE == isCANBoxForXmit( (CAN_MESSAGE_BOX_T)buffer ) ) )
         {
             // thread protection for queue operations
             _disable_IRQ();
@@ -155,7 +154,8 @@
         {
 #ifdef DEBUG_ENABLED
             char debugStr[100];
-            sprintf( debugStr, "Buf OF:#%3d,%3d, %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n", buffer, len, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7] );
+            sprintf( debugStr, "Buf OF:#%3d,%3d, %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n", buffer, len, \
+                     data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7] );
             sendDebugData( (U08*)debugStr, strlen(debugStr) );
             sendDebugDataToUI( (U08*)debugStr );
 #endif
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r73113d51d6ca20fd4e34d69d241fbb18bb70dc1e -r777d38c1f794e05052f47c3ed1826487722e0335
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 73113d51d6ca20fd4e34d69d241fbb18bb70dc1e)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 777d38c1f794e05052f47c3ed1826487722e0335)
@@ -978,7 +978,7 @@
 
 /*********************************************************************//**
  * @brief
- * The getFPGAVersions function gets the fpga version numbers.
+ * The getFPGAVersions function gets the FPGA version numbers.
  * @details
  * Inputs : fpgaHeader
  * Outputs : none
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -ra0504d43ac65e7c97adfb92004b45d72d61be5e4 -r777d38c1f794e05052f47c3ed1826487722e0335
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a0504d43ac65e7c97adfb92004b45d72d61be5e4)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 777d38c1f794e05052f47c3ed1826487722e0335)
@@ -753,7 +753,8 @@
         memcpy( &resID, message->payload, sizeof(U32) );
         reservoirID = (RESERVOIR_ID_T)resID;
         setActiveReservoirCmd( reservoirID );
-    }
+    }
+
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }
 
@@ -777,7 +778,8 @@
         result = TRUE;
         memcpy( &fillToVolumeMl, message->payload, sizeof(U32) );
         startFillCmd( fillToVolumeMl );
-    }
+    }
+
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }
 
@@ -802,7 +804,8 @@
         memcpy( &drainToVolMl, message->payload, sizeof(U32) );
 
         startDrainCmd( drainToVolMl );
-    }
+    }
+
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }
 
@@ -834,7 +837,8 @@
         {
             result = requestDGStop();
         }
-    }
+    }
+
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }
 
@@ -866,7 +870,8 @@
         {
             result = stopTrimmerHeaterCmd();
         }
-    }
+    }
+
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }
 
@@ -889,7 +894,8 @@
         {
             result = requestWaterSample();
         }
-    }
+    }
+
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 }
 
@@ -949,7 +955,8 @@
             stopPrimaryHeater();
             result = TRUE;
         }
-    }
+    }
+
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 
     return result;
Index: firmware/App/Tasks/TaskTimer.c
===================================================================
diff -u -r439894cb0508e69af3ece09ae57a62feac09e3f2 -r777d38c1f794e05052f47c3ed1826487722e0335
--- firmware/App/Tasks/TaskTimer.c	(.../TaskTimer.c)	(revision 439894cb0508e69af3ece09ae57a62feac09e3f2)
+++ firmware/App/Tasks/TaskTimer.c	(.../TaskTimer.c)	(revision 777d38c1f794e05052f47c3ed1826487722e0335)
@@ -44,5 +44,3 @@
 #ifdef TASK_TIMING_OUTPUT_ENABLED
 #endif
 }
-
-