Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -rc672f41061bcd500d6593655641cb27ce3ae58fc -r78c03fb021407eaf8d17dd0f74f6969443b397ce
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision c672f41061bcd500d6593655641cb27ce3ae58fc)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 78c03fb021407eaf8d17dd0f74f6969443b397ce)
@@ -82,7 +82,7 @@
 };
 
 static ALARM_LAMP_SELF_TEST_STATE_T alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_START;  ///< Current alarm lamp self-test state.
-static U32 alarmLampSelfTestStepTimerCount = 0;                         ///< timer counter for current alarm lamp self-test state.
+static U32 alarmLampSelfTestStepTimerCount = 0;                         ///< Timer counter for current alarm lamp self-test state.
 
 // ********** private function prototypes **********
 
@@ -117,33 +117,33 @@
  *************************************************************************/
 void execAlarmLamp( void )
 {
-    // if starting a new lamp pattern, reset pattern variables
+    // If starting a new lamp pattern, reset pattern variables
     if ( pendingLampPattern != currentLampPattern.data )
     {
         currentLampPattern.data = pendingLampPattern;
         currentLampPatternStep = 0;
 
         setAlarmLampToPatternStep();
     }
-    // otherwise, increment pattern timer
+    // Otherwise, increment pattern timer
     else
     {
         lampPatternStepTimer += ALARM_LAMP_AND_AUDIO_CONTROL_INTERVAL_MS;
     }
 
-    // control alarm lamp to currently set pattern (unless we're in manual pattern)
+    // Control alarm lamp to currently set pattern (unless we're in manual pattern)
     if ( getCurrentAlarmLampPattern() != LAMP_PATTERN_MANUAL )
     {
-        // if pattern step duration has elapsed, move to next step
+        // If pattern step duration has elapsed, move to next step
         if ( lampPatternStepTimer >= lampPatterns[ getCurrentAlarmLampPattern() ].duration[ currentLampPatternStep ] )
         {
-            // increment pattern step
+            // Increment pattern step
             currentLampPatternStep++;
             if ( currentLampPatternStep >= NUM_OF_LAMP_STATES )
             {
                 currentLampPatternStep = 0;
             }
-            // set lamps according to pattern step
+            // Set lamps according to pattern step
             setAlarmLampToPatternStep();
         }
     }
@@ -251,7 +251,7 @@
             break;
 
         case ALARM_LAMP_SELF_TEST_STATE_COMPLETE:
-            // if we get called in this state, assume we're doing self-test again
+            // If we get called in this state, assume we're doing self-test again
             alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_START;
             break;