Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rc453782e68c6f05a67a3e0839467e5941c8b21db -r5fd2b37518ca5aa90ec8b7a1d226188390eb62ac
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision c453782e68c6f05a67a3e0839467e5941c8b21db)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 5fd2b37518ca5aa90ec8b7a1d226188390eb62ac)
@@ -440,7 +440,7 @@
     // Air pump stop time based on the blood flow rate
     S32  qB                 = 500; // TODO abs( getTargetBloodFlowRate() );
     U32  qBx                = ( 0 == qB ? MIN_SET_BLOOD_FLOW_RATE : (U32)qB );
-    U32  airPumpStopTime    = 10000;  //AIR_PUMP_LOWER_OP_TIME_MIN_MS + ( ( qBx - MIN_SET_BLOOD_FLOW_RATE ) / 2 );
+    U32  airPumpStopTime    = 1000;  //AIR_PUMP_LOWER_OP_TIME_MIN_MS + ( ( qBx - MIN_SET_BLOOD_FLOW_RATE ) / 2 );
 
     // Transition to manual valve control state when requested
     if ( TRUE == pendingStopAirTrapController )
@@ -452,7 +452,7 @@
     }
     // Transition back to closed state when air trap lower level operation completed when air detected at upper level
     else if ( ( TRUE == didTimeout( airTrapLowerStartTime, airPumpStopTime ) ) ||
-              ( AIR_TRAP_LEVEL_AIR   == getRawLevelSensorState( H16_LEVL ) ) )
+              ( AIR_TRAP_LEVEL_AIR == getRawLevelSensorState( H16_LEVL ) ) )
     {
         setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
         set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );