Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r7dae221794a30c403c06d90e12f3ab28830dffbe -r366524fefd65d22b72bf53649180a6302bc9e7a3
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 7dae221794a30c403c06d90e12f3ab28830dffbe)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 366524fefd65d22b72bf53649180a6302bc9e7a3)
@@ -186,7 +186,6 @@
     U32 activeAlarmList[ MAX_ALARM_LIST_SIZE ]; ///< Active Alarm List array.
 } ACTIVE_ALARM_LIST_RESPONSE_PAYLOAD_T;
 
-
 // ********** public function prototypes **********
 
 void initAlarmMgmt( void );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re5fc9a1e8898da7bc6d26f1e333ee44f6544d214 -r366524fefd65d22b72bf53649180a6302bc9e7a3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e5fc9a1e8898da7bc6d26f1e333ee44f6544d214)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 366524fefd65d22b72bf53649180a6302bc9e7a3)
@@ -287,7 +287,7 @@
  * and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
  * @details Outputs: Off button msg constructed and queued.
- * @param cmd 0=prompt user to confirm, 1=cancel prompt, 2=reject user off request
+ * @param prompt 0=prompt user to confirm, 1=cancel prompt, 2=reject user off request
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL sendOffButtonMsgToUI( U08 prompt )
@@ -303,7 +303,7 @@
     msg.hdr.msgID = MSG_ID_OFF_BUTTON_PRESS_REQUEST;
     msg.hdr.payloadLen = sizeof( UI_OFF_BUTTON_RESPONSE_PAYLOAD_T );
 
-    memcpy(&msg.payload, &cmd, sizeof( UI_OFF_BUTTON_RESPONSE_PAYLOAD_T ) );
+    memcpy( &msg.payload, &cmd, sizeof( UI_OFF_BUTTON_RESPONSE_PAYLOAD_T ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
@@ -726,7 +726,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
     }
 }
 
@@ -747,7 +747,7 @@
     }
     else
     {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
+        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
     }
 }
 
@@ -886,7 +886,7 @@
 {
     U32 cmd;
 
-    if ( message->hdr.payloadLen == sizeof( U32 ) )
+    if ( sizeof( U32 ) == message->hdr.payloadLen )
     {
         memcpy( &cmd, &message->payload[0], sizeof( U32 ) );
         signalInitiateStandbyDisinfectSubmode( cmd );
@@ -1214,7 +1214,7 @@
  *************************************************************************/
 void handleInstallationConfirm( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == 0)
+    if ( 0 == message->hdr.payloadLen)
     {
         signalUserConfirmInstallation();
     }
@@ -3158,7 +3158,7 @@
 void handleUIVersionResponse( MESSAGE_T *message )
 {
     // Get UI version data and have it recorded
-    if ( message->hdr.payloadLen == sizeof(UI_VERSIONS_T) )
+    if ( sizeof(UI_VERSIONS_T) == message->hdr.payloadLen )
     {
         UI_VERSIONS_T uiVersion;
 
@@ -7195,7 +7195,7 @@
     DG_OP_MODE_T currentDGMode = getDGOpMode();
     REQUEST_REJECT_REASON_CODE_T reject;
 
-    if ( message->hdr.payloadLen == 0 )
+    if ( 0 == message->hdr.payloadLen )
     {
         if ( ( MODE_STAN == currentMode ) || ( MODE_FAUL == currentMode ) )
         {