Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -rf46b7a1f9bbfa15ab3f9b6a0fe6873f393f10248 -ra1132795f560349be3090090ed7f8df9543140f8
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision f46b7a1f9bbfa15ab3f9b6a0fe6873f393f10248)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision a1132795f560349be3090090ed7f8df9543140f8)
@@ -717,43 +717,35 @@
 #endif
     {
         // Range check occlusion sensor
-
         if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, outOfRange ) )
         {
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, bpOccl );
         }
 
         // Check for occlusion in PreTreatment modes when the cartridge is installed
         // and setOcclusionInstallLevel has been called.
-
-        if( MODE_PRET == getCurrentOperationMode() )
+        if ( MODE_PRET == getCurrentOperationMode() )
         {
 
-            if( getPreTreatmentSubState() > HD_PRE_TREATMENT_CART_INSTALL_STATE && getDrySelfTestsState() > DRY_SELF_TESTS_START_STATE )
+            if ( getPreTreatmentSubState() > HD_PRE_TREATMENT_CART_INSTALL_STATE && getDrySelfTestsState() > DRY_SELF_TESTS_START_STATE )
             {
-                // Check for occlusion
-
+                // Check for occlusion
                 if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
                 {
-
                     signalBloodPumpHardStop();  // Stop pump immediately
                     SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
                 }
             }
         }
 
         // Check for occlusion in Treatment modes where pumps are moving
-        else if( MODE_TREA == getCurrentOperationMode() )
+        else if ( MODE_TREA == getCurrentOperationMode() )
         {
-
-            if( TREATMENT_STOP_STATE != getTreatmentState())
+            if ( TREATMENT_STOP_STATE != getTreatmentState() )
             {
-
                 // Check for occlusion
-
                 if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
                 {
-
                     signalBloodPumpHardStop();  // Stop pump immediately
                     SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
                 }