Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r6ad57767b87b8e691c6cbb728b56efabe8a28e8e -r7bb46513e0563ac58f769f654ac67ae694f369ad
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 6ad57767b87b8e691c6cbb728b56efabe8a28e8e)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 7bb46513e0563ac58f769f654ac67ae694f369ad)
@@ -42,7 +42,7 @@
 #define VALVE_HOME_BACK_OFF_EDGE            3                                                   ///< Encoder counts to back off of detected edge position.
 #define MAX_HOME_FULL_TRAVEL_DIFF           10U                                                 ///< Maximum allowed difference in full travel encoder counts between expected and measured during home operation.
 #define VALVE_TRANSITION_TIMEOUT_MS         ( 3 * MS_PER_SECOND )                               ///< Valves transition time out in ms.
-#define VALVE_HOMING_TIMEOUT_MS             ( 15 * MS_PER_SECOND )
+#define VALVE_HOMING_TIMEOUT_MS             ( 15 * MS_PER_SECOND )                              ///< Valves homing time out in ms.
 #define HOMING_EDGE_DETECTION_TIMEOUT_MS    ( 0.5 * MS_PER_SECOND )                             ///< Valves homing edge detection timeout in milliseconds.
 #define VALVE_FORCE_HOME                    TRUE                                                ///< Force valve to home even if already homed.
 #define ZERO_ENC_DEBOUNCE_THRESHOLD_CNT     5                                                   ///< Valves zero encoder debounce threshold count.
@@ -171,7 +171,7 @@
                 currentValveStates[ valve ].hasHomingBeenRequested     = TRUE;
                 currentValveStates[ valve ].hasTransitionBeenRequested = FALSE;
                 currentValveStates[ valve ].currentPosition            = VALVE_POSITION_NOT_IN_POSITION;
-                result = TRUE;
+                result                                                 = TRUE;
             }
         }
         else
@@ -284,9 +284,6 @@
 {
     VALVE_T valve;
 
-//    execPinchValveCommand();
-//    execPinchValveFunction();
-
     for ( valve = FIRST_VALVE; valve < NUM_OF_VALVES; valve++ )
     {
         // execute valve state machine
@@ -397,10 +394,10 @@
     else if ( ( TRUE == currentValveStates[ valve ].homingOperationActive ) && ( TRUE == isPinchValveHomed( valve ) ) )
     {
         currentValveStates[ valve ].homingOperationActive = FALSE;
-        currentValveStates[ valve ].hasValveBeenHomed = TRUE;
-        currentValveStates[ valve ].commandedPosition = VALVE_POSITION_C_CLOSE;
-        currentValveStates[ valve ].currentPosition   = getCurrentValveABCPosition( valve );
-        nextState = VALVE_STATE_IDLE;
+        currentValveStates[ valve ].hasValveBeenHomed     = TRUE;
+        currentValveStates[ valve ].commandedPosition     = VALVE_POSITION_C_CLOSE;
+        currentValveStates[ valve ].currentPosition       = getCurrentValveABCPosition( valve );
+        nextState                                         = VALVE_STATE_IDLE;
     }
     else if ( ( TRUE == currentValveStates[ valve ].homingOperationActive ) &&
               ( TRUE == didTimeout( currentValveStates[ valve ].valveOpsStartTime, VALVE_HOMING_TIMEOUT_MS ) ) &&