Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -re36779b694d139c5115587c2893dcb5dff10d663 -r7862d0ea442227339a8c94ff37c3a98eee54a40b
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision e36779b694d139c5115587c2893dcb5dff10d663)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 7862d0ea442227339a8c94ff37c3a98eee54a40b)
@@ -81,7 +81,7 @@
 #define FPGA_AIRTRAP_LEVEL_LOW_MASK     0x0008                  ///< Bit mask for air trap lower level sensor.
 #define FPGA_AIRTRAP_LEVEL_HIGH_MASK    0x0004                  ///< Bit mask for air trap upper level sensor.
 
-#define FPGA_FLUIDLEAK_STATE_MASK       0x0040                  ///< Bit mask for fluid leak sensor.
+#define FPGA_FLUIDLEAK_STATE_MASK       0x0040                  ///< Bit mask for fluid leak detector.
 
 // FPGA Sensors Record
 #pragma pack(push,1)
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1c71ed34abf9860f6ffdfc49abf435d462a35672 -r7862d0ea442227339a8c94ff37c3a98eee54a40b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1c71ed34abf9860f6ffdfc49abf435d462a35672)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7862d0ea442227339a8c94ff37c3a98eee54a40b)
@@ -1262,7 +1262,7 @@
 
 /***********************************************************************//**
  * @brief
- * The broadcastFluidLeakState function constructs an HD air trap data msg to \n
+ * The broadcastFluidLeakState function constructs an HD fluid leak state msg to \n
  * be broadcasted and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
  * @details Outputs: fluid leak state msg constructed and queued
@@ -3937,12 +3937,12 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetAirTrapLevelOverride( (AIR_TRAP_LEVEL_SENSORS_T)payload.index, (AIR_TRAP_LEVELS_T)(payload.state.u32) );
+            result = testSetAirTrapLevelOverride( (AIR_TRAP_LEVEL_SENSORS_T)payload.index, (AIR_TRAP_LEVELS_T)( payload.state.u32 ) );
         }
         else
         {
@@ -3969,12 +3969,12 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetFluidLeakStatePublishIntervalOverride( (U32)(payload.state.u32) );
+            result = testSetFluidLeakStatePublishIntervalOverride( (U32)( payload.state.u32 ) );
         }
         else
         {
@@ -4001,12 +4001,12 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetFluidLeakStateOverride( ( FLUID_LEAK_STATES_T)(payload.state.u32) );
+            result = testSetFluidLeakStateOverride( ( FLUID_LEAK_STATES_T)( payload.state.u32 ) );
         }
         else
         {