Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -rbaec590e57965acc167c510875127addf4ac34dd -r8b97a7e50a19f1c243559ad77c69b6a9e6ad067a
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision baec590e57965acc167c510875127addf4ac34dd)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 8b97a7e50a19f1c243559ad77c69b6a9e6ad067a)
@@ -151,7 +151,8 @@
     newMode = arbitrateModeRequest();   // Will return current mode if no pending requests
 
 #ifndef TEST_UI_ONLY
-    // Verify mode transition is legal unless tester working with system    TODO - restore check when all modes are implemented
+    // Verify mode transition is legal unless tester working with system
+    //TODO - restore check when all modes are implemented
 //    if ( ( isTestingActivated() != TRUE ) && ( getTestConfigStatus( TEST_CONFIG_RECOVER_TREATMENT ) != TRUE ) )
     {
         newMode = MODE_TRANSITION_TABLE[ currentMode ][ newMode ];
@@ -161,7 +162,8 @@
     // Is requested new mode valid and legal at this time?
     if ( newMode >= MODE_NLEG )
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, newMode )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT,
+                                   SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, newMode )
         newMode = currentMode;
     }
 
@@ -176,7 +178,8 @@
         if ( MODE_TREA == lastMode )
         {
             // If the last mode is treatment but the new mode is not treatment
-            // it means the treatment is done. Get the elapsed time since the beginning of the treatment and convert it to hours to be written
+            // it means the treatment is done. Get the elapsed time since the
+            // beginning of the treatment and convert it to hours to be written
             U32 txElapsedTimeMS  = calcTimeSince( getTreatmentStartTimeStamp() );
             F32 txElapsedTimeHrs = (F32)txElapsedTimeMS / ( (F32)( MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND ) );
 
@@ -222,15 +225,18 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, currentMode )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT,
+                                       SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE,
+                                       currentMode )
             currentMode = MODE_FAUL;
             currentSubMode = 0;
             break;
     }   // End switch
 
 #ifndef _VECTORCAST_
     // Send operation status event when appropriate
-    if ( ( priorSubMode != currentSubMode ) || ( priorSubState != currentSubState ) || ( prior4thLevelState != current4thLevelState ) )
+    if ( ( priorSubMode != currentSubMode ) || ( priorSubState != currentSubState )
+            || ( prior4thLevelState != current4thLevelState ) )
 #endif
     {
         sendOperationStatusEvent();
@@ -338,7 +344,9 @@
 //            signalAlarmActionToPostTreatmentMode( action );
 //            break;
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_SIGNAL_ACTION, currentMode )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT,
+                                       SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_SIGNAL_ACTION,
+                                       currentMode )
             break;
     }
 }
@@ -467,7 +475,6 @@
     U32  pendingIndex                    = 0;
     CONFIRMATION_REQUEST_STATUS_T status = CONFIRMATION_REQUEST_STATUS_PENDING;
     U32  i;
-
     GENERIC_CONFIRMATION_REQUEST_T cmd;
 
     memset( &cmd, 0, sizeof( GENERIC_CONFIRMATION_REQUEST_T ) );
@@ -556,14 +563,16 @@
 /*********************************************************************//**
  * @brief
  * The addConfirmationRequest function sends a confirmation request to UI
- * @details \b Inputs: confirmRequests[]
+ * @details \b Inputs: confirmRequests[], MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST
  * @details \b Outputs: confirmRequests[] new added.
  * @param requestID ID of confirmation being requested
  * @param requestType Type of confirmation being requested (open, close, reject)
  * @param rejectReason Reason for reject if type is reject
  * @return request ID - will be non-zero if added
  *************************************************************************/
-GENERIC_CONFIRM_ID_T addConfirmationRequest( GENERIC_CONFIRM_ID_T requestID, GENERIC_CONFIRM_COMMAND_T requestType, U32 rejectReason )
+GENERIC_CONFIRM_ID_T addConfirmationRequest( GENERIC_CONFIRM_ID_T requestID,
+                                             GENERIC_CONFIRM_COMMAND_T requestType,
+                                             U32 rejectReason )
 {
     U32 i;
     BOOL confirmAlreadyPending = FALSE;