Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r549fea9aba0bc5bc03d195d1a5659261e3ace9d0 -r6a5da69ce3b1048fbbccb766df391eb6dcc1010c
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 549fea9aba0bc5bc03d195d1a5659261e3ace9d0)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 6a5da69ce3b1048fbbccb766df391eb6dcc1010c)
@@ -54,7 +54,6 @@
     CONFIRMATION_REQUEST_STATUS_T status;               ///< Request status (pending, accepted, rejected)
 } CONFIRMATION_REQUEST_T;
 
-
 // ********** private data **********
 
 static volatile BOOL modeRequest[ NUM_OF_MODES - 1 ];       ///< Pending operation mode change requests.
@@ -65,6 +64,7 @@
 /// Interval (in task intervals) at which to publish operation mode data to CAN bus.
 static OVERRIDE_U32_T opModePublishInterval = { BROADCAST_HD_OP_MODE_INTERVAL, BROADCAST_HD_OP_MODE_INTERVAL, BROADCAST_HD_OP_MODE_INTERVAL, 0 };
 static U32 priorSubMode = 0;                                ///< The prior submode state.
+/// Local structure init for saving confirmation requests
 static CONFIRMATION_REQUEST_T confirmRequests[NUM_CONFIRM_REQUESTS] =
                                                    { GENERIC_CONFIRM_ID_NONE, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
                                                      GENERIC_CONFIRM_ID_NONE, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
Index: firmware/App/Modes/OperationModes.h
===================================================================
diff -u -r549fea9aba0bc5bc03d195d1a5659261e3ace9d0 -r6a5da69ce3b1048fbbccb766df391eb6dcc1010c
--- firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision 549fea9aba0bc5bc03d195d1a5659261e3ace9d0)
+++ firmware/App/Modes/OperationModes.h	(.../OperationModes.h)	(revision 6a5da69ce3b1048fbbccb766df391eb6dcc1010c)
@@ -38,7 +38,6 @@
     U32 subMode;                         ///< Current sub-mode of current operating mode
 } OP_MODE_PAYLOAD_T;
 
-
 // ********** public function prototypes **********
 
 void initOperationModes( void );                                    // Initialize this module
@@ -48,9 +47,9 @@
 HD_OP_MODE_T getPreviousOperationMode( void );                      // Get the previous operation mode
 U32  getCurrentSubMode( void );                                     // Get the current sub-mode
 void initiateAlarmAction( ALARM_ACTION_T action );                  // Initiate an alarm or alarm recovery action according to current op mode
-CONFIRMATION_REQUEST_STATUS_T getConfirmationRequestStatus( GENERIC_CONFIRM_ID_T request_id );
-void setConfirmationRequestStatus( GENERIC_CONFIRM_ID_T request_id, CONFIRMATION_REQUEST_STATUS_T status );
-GENERIC_CONFIRM_ID_T addConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason );
+CONFIRMATION_REQUEST_STATUS_T getConfirmationRequestStatus( GENERIC_CONFIRM_ID_T request_id );      // Get the current confirmation request status
+void setConfirmationRequestStatus( GENERIC_CONFIRM_ID_T request_id, CONFIRMATION_REQUEST_STATUS_T status );  // Set the confirmation request status
+GENERIC_CONFIRM_ID_T addConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason );  // Add a new confirmation request
 
 BOOL testSetOperationMode( HD_OP_MODE_T newMode );                  // Force transition to a given mode (if allowed)
 BOOL testSetOpModePublishIntervalOverride( U32 ms );
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r549fea9aba0bc5bc03d195d1a5659261e3ace9d0 -r6a5da69ce3b1048fbbccb766df391eb6dcc1010c
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 549fea9aba0bc5bc03d195d1a5659261e3ace9d0)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 6a5da69ce3b1048fbbccb766df391eb6dcc1010c)
@@ -433,9 +433,10 @@
 
 // MSG_ID_UI_CONFIRMATION_RESULT
 void handleUIConfirmationResponse( MESSAGE_T *message );
+
+// MSG_ID_HD_REQUEST_UI_CONFIRMATION
 void sendConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason );
 
-
 // MSG_ID_HD_REQUEST_DG_ALARMS
 BOOL sendRequestForDGResendAlarms( void );