Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r0589eeee132373075cccc56eab04db2b5160ae81 -r457fc704dc96f6da4e14263d576bc3ba479e36a8
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 0589eeee132373075cccc56eab04db2b5160ae81)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 457fc704dc96f6da4e14263d576bc3ba479e36a8)
@@ -38,7 +38,7 @@
  *  @{
  */
 
-// ********** private data **********
+// ********** private definitions **********
 
 #define BROADCAST_HD_OP_MODE_INTERVAL     ( 250 / TASK_GENERAL_INTERVAL )                         ///< HD operation mode broadcast interval (in task interval/sec).
 #define DATA_PUBLISH_COUNTER_START_COUNT  11                                                      ///< Data publish counter start count.
@@ -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,