Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r1fdea235ab91f7922f95387bdcfc383a0d330740 -r6cc48a92eda5d3b797eb470b37bb097907dbea8e
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 1fdea235ab91f7922f95387bdcfc383a0d330740)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 6cc48a92eda5d3b797eb470b37bb097907dbea8e)
@@ -587,8 +587,8 @@
         }
 
         // Check arterial pressure during treatment mode
-        if ( ( MODE_TREA == getCurrentOperationMode() ) &&
-                ( TREATMENT_DIALYSIS_STATE == getTreatmentState()  && getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) )
+        if ( MODE_TREA == getCurrentOperationMode() &&
+             TREATMENT_DIALYSIS_STATE == getTreatmentState()  && getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE )
         {
             F32 artLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
             F32 artHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
@@ -651,8 +651,8 @@
         }
 
         // Check venous pressure during treatment mode
-        if ( ( MODE_TREA == getCurrentOperationMode() ) &&
-                ( TREATMENT_DIALYSIS_STATE == getTreatmentState() && getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) )
+        if ( MODE_TREA == getCurrentOperationMode() &&
+             TREATMENT_DIALYSIS_STATE == getTreatmentState() && getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE )
         {
             F32 venLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
             F32 venHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -rff5d79f69db29d73a440d0ca8e6854b5837205d3 -r6cc48a92eda5d3b797eb470b37bb097907dbea8e
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision ff5d79f69db29d73a440d0ca8e6854b5837205d3)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 6cc48a92eda5d3b797eb470b37bb097907dbea8e)
@@ -120,13 +120,12 @@
             // If the debounce time has been elapsed, update the switch status to the new status
             else if ( TRUE == didTimeout( switchesStatus[ i ].debounceStartTime, SWITCHES_DEBOUNCE_TIME_MS ) )
             {
-
-                if (FRONT_DOOR == i)
+                if ( FRONT_DOOR == i )
                 {
                     // Log front door switch change
                     sendTreatmentLogEventData( FRONT_DOOR_SWITCH_CHANGED_EVENT, (F32)switchesStatus[ i ].status.data, (F32)currentSwitchStatus );
                 }
-                else if (PUMP_TRACK_SWITCH == i)
+                else if ( PUMP_TRACK_SWITCH == i )
                 {
                     // Log pump track switch change
                     sendTreatmentLogEventData( PUMP_TRACK_SWITCH_CHANGED_EVENT, (F32)switchesStatus[ i ].status.data, (F32)currentSwitchStatus );
Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r776acee590c45e3ea34c0126f8483608bb021ed4 -r6cc48a92eda5d3b797eb470b37bb097907dbea8e
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 776acee590c45e3ea34c0126f8483608bb021ed4)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 6cc48a92eda5d3b797eb470b37bb097907dbea8e)
@@ -941,9 +941,9 @@
     syringePumpMeasSyringeDetectionSwitch.data = ( (F32)getFPGASyringePumpADCChannel1() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS;
 
     // Log syringe detect switch changes
-    if ( prevSyringeDetected !=  isSyringeDetected())
+    if ( prevSyringeDetected !=  isSyringeDetected() )
     {
-        sendTreatmentLogEventData( SYRINGE_DETECTION_SWITCH_CHANGED_EVENT, (F32)prevSyringeDetected, (F32)isSyringeDetected());
+        sendTreatmentLogEventData( SYRINGE_DETECTION_SWITCH_CHANGED_EVENT, (F32)prevSyringeDetected, (F32)isSyringeDetected() );
     }
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
@@ -982,7 +982,7 @@
     syringePumpLastPosition = getSyringePumpPosition();
     syringePumpPosition.data = encPosition - syringePumpHomePositionOffset;
     // Calculate volume delivered from position
-    syringePumpVolumeDelivered.data = (F32)(syringePumpPosition.data - syringePumpVolumeStartPosition) / SYRINGE_ENCODER_COUNTS_PER_ML;
+    syringePumpVolumeDelivered.data = (F32)( syringePumpPosition.data - syringePumpVolumeStartPosition ) / SYRINGE_ENCODER_COUNTS_PER_ML;
     calcSafetyVolumeDelivered();
     // Calculate measured rate (mL/hr)
     calcMeasRate();
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rff5d79f69db29d73a440d0ca8e6854b5837205d3 -r6cc48a92eda5d3b797eb470b37bb097907dbea8e
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision ff5d79f69db29d73a440d0ca8e6854b5837205d3)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 6cc48a92eda5d3b797eb470b37bb097907dbea8e)
@@ -1117,7 +1117,6 @@
             pendingUFVolumeChange = uFVolume;
             pendingTreatmentTimeChange = trtTime;
             timeDiff = trtTime - ( (U32)( (F32)presTreatmentTimeSecs / (F32)SEC_PER_MIN ) + 1 );
-
         }
         else
         {
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rff5d79f69db29d73a440d0ca8e6854b5837205d3 -r6cc48a92eda5d3b797eb470b37bb097907dbea8e
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision ff5d79f69db29d73a440d0ca8e6854b5837205d3)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 6cc48a92eda5d3b797eb470b37bb097907dbea8e)
@@ -653,10 +653,12 @@
     U32  rejReason = REQUEST_REJECT_REASON_NONE;
 
     if ( ( volumeLevel > 0 ) && ( volumeLevel <= MAX_ALARM_VOLUME_LEVEL ) )
-    {   // Convert volume level to attenuation level
+    {
+        sendTreatmentLogEventData( ALARM_AUDIO_VOLUME_CHANGED_EVENT, (F32)volumeLevel, (F32)getAlarmAudioVolume() );
+        // Convert volume level to attenuation level
         alarmAudioVolumeLevel.data = MAX_ALARM_VOLUME_LEVEL - volumeLevel;
         accepted = TRUE;
-        sendTreatmentLogEventData( ALARM_AUDIO_VOLUME_CHANGED_EVENT, (F32)volumeLevel, (F32)getAlarmAudioVolume());
+        sendTreatmentLogEventData( ALARM_AUDIO_VOLUME_CHANGED_EVENT, (F32)volumeLevel, (F32)getAlarmAudioVolume() );
     }
     else
     {
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2ad5befab1030c921a87df8ef8848082b19d10de -r6cc48a92eda5d3b797eb470b37bb097907dbea8e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2ad5befab1030c921a87df8ef8848082b19d10de)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6cc48a92eda5d3b797eb470b37bb097907dbea8e)
@@ -2700,11 +2700,8 @@
     if ( message->hdr.payloadLen == sizeof(U32) )
     {
         U32 timeInMin;
-
         memcpy( &timeInMin, message->payload, sizeof(U32) );
-
-        verifyTreatmentDurationSettingChange( timeInMin );
-
+        verifyTreatmentDurationSettingChange( timeInMin );
     }
     else
     {