Index: firmware/App/Drivers/ConductivitySensor.c
===================================================================
diff -u -r3a5cc585b69ffa194e3601a005915d23b48bd865 -r9b91228c0cb3eee3f06cfab4436e812722187839
--- firmware/App/Drivers/ConductivitySensor.c	(.../ConductivitySensor.c)	(revision 3a5cc585b69ffa194e3601a005915d23b48bd865)
+++ firmware/App/Drivers/ConductivitySensor.c	(.../ConductivitySensor.c)	(revision 9b91228c0cb3eee3f06cfab4436e812722187839)
@@ -20,7 +20,7 @@
 
 #include "ConductivitySensor.h"
 #include "FpgaFP.h"
-#include "FPOperationMode.h"
+#include "FPOperationModes.h"
 #include "MessageSupport.h"
 #include "Messaging.h"
 #include "PersistentAlarm.h"
Index: firmware/App/Modes/ModeGenPermeateDefeatured.c
===================================================================
diff -u -r6dd382e3988fac2f9ee041b4738d67305e17a6a2 -r9b91228c0cb3eee3f06cfab4436e812722187839
--- firmware/App/Modes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision 6dd382e3988fac2f9ee041b4738d67305e17a6a2)
+++ firmware/App/Modes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision 9b91228c0cb3eee3f06cfab4436e812722187839)
@@ -59,7 +59,7 @@
  *************************************************************************/
 void initGenPermeateDefeaturedMode( void )
 {
-    genPermeateDefState = FP_GENP_DEF_PAUSED;
+    genPermeateDefState                            = FP_GENP_DEF_PAUSED;
     genPermeateDefDataPublishInterval.data         = PRE_GEN_DEF_PERMEATE_DATA_PUBLISH_INTERVAL;
     genPermeateDefDataPublishInterval.ovData       = PRE_GEN_DEF_PERMEATE_DATA_PUBLISH_INTERVAL;
     genPermeateDefDataPublishInterval.ovInitData   = 0;
@@ -80,6 +80,7 @@
 {
     initGenPermeateDefeaturedMode();
     setCurrentSubState( genPermeateDefState );
+
     return genPermeateDefState;
 }
 
@@ -127,7 +128,7 @@
  * @brief
  * The setModeGenPDefTransition function sets the actuators and variables
  * for the state transition in generate permeate mode.
- * @details Inputs: Valve states, Pump speed
+ * @details Inputs: none
  * @details Outputs: Actuate valves, pumps as desired.
  * @param state gen permeate state enum
  * @return none
@@ -257,6 +258,7 @@
 BOOL requestGenWaterDefStop( void )
 {
     BOOL result = TRUE;
+
     pendingStartGenDefRequest = FALSE;
     requestNewOperationMode( FP_MODE_STAN );
 
Index: firmware/App/Modes/ModeGenPermeateDefeatured.h
===================================================================
diff -u -r8d272582cbd2cb5fc0c6af0fead2867ce02658b0 -r9b91228c0cb3eee3f06cfab4436e812722187839
--- firmware/App/Modes/ModeGenPermeateDefeatured.h	(.../ModeGenPermeateDefeatured.h)	(revision 8d272582cbd2cb5fc0c6af0fead2867ce02658b0)
+++ firmware/App/Modes/ModeGenPermeateDefeatured.h	(.../ModeGenPermeateDefeatured.h)	(revision 9b91228c0cb3eee3f06cfab4436e812722187839)
@@ -39,18 +39,17 @@
 
 // ********** public function prototypes **********
 
-void initGenPermeateDefeaturedMode( void );                                           // Initialize this gen permeate mode unit
+void initGenPermeateDefeaturedMode( void );                                          // Initialize this gen permeate mode unit
 U32 transitionToGenPermeateDefeaturedMode( void );                                   // Transition to gen permeate mode
 U32 execGenPermeateDefeaturedMode( void );                                           // Execute the gen permeate mode state machine (call from OperationModes)
-BOOL requestGenWaterDefStart( void );
-BOOL requestGenWaterDefStop( void );
-BOOL getGenPermeateRequest( void );
+BOOL requestGenWaterDefStart( void );                                                // request to start gen permeate in defeatured mode
+BOOL requestGenWaterDefStop( void );                                                 // request to stop gen permeate in defeatured mode
+BOOL getGenPermeateRequest( void );                                                  // get function to retrieve request status
 
-FP_GENP_DEF_MODE_STATE_T getCurrentGenPermeateDefState( void );                       // Get the current state of the gen water mode
+FP_GENP_DEF_MODE_STATE_T getCurrentGenPermeateDefState( void );                      // Get the current state of the gen water mode
 
-BOOL testGenPermeateDefDataPublishIntervalOverride( MESSAGE_T *message );    // override broadcast interval for gen permeate
+BOOL testGenPermeateDefDataPublishIntervalOverride( MESSAGE_T *message );            // override broadcast interval for defeatued gen permeate
 
 /**@}*/
 
-
 #endif
Index: firmware/App/Modes/ModePreGenPermeateDefeatured.c
===================================================================
diff -u -r6dd382e3988fac2f9ee041b4738d67305e17a6a2 -r9b91228c0cb3eee3f06cfab4436e812722187839
--- firmware/App/Modes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision 6dd382e3988fac2f9ee041b4738d67305e17a6a2)
+++ firmware/App/Modes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision 9b91228c0cb3eee3f06cfab4436e812722187839)
@@ -87,6 +87,7 @@
 {
     initGenPermeateDefeaturedMode();
     setCurrentSubState( preGenPermeateDefState );
+
     return preGenPermeateDefState;
 }
 
@@ -138,7 +139,7 @@
  * @brief
  * The setModePreGenPDefTransition function sets the actuators and variables
  * for the state transition in generate permeate mode.
- * @details Inputs: Valve states, Pump speed
+ * @details Inputs: none
  * @details Outputs: Actuate valves, pumps as desired.
  * @param state gen permeate state enum
  * @return none
@@ -199,8 +200,8 @@
  * @brief
  * The handlePreGenPDefFlushState handles the supply water of gen permeate
  * defeatured mode.
- * @details \b Inputs:  none
- * @details \b Outputs: nones
+ * @details \b Inputs:  preGenPermeateDefFlushTimer
+ * @details \b Outputs: none
  * @return the next state of gen water defeatured mode
  *************************************************************************/
 static FP_PRE_GENP_DEF_MODE_STATE_T handlePreGenPDefFlushState( void )
@@ -216,14 +217,15 @@
     {
         state = FP_PRE_GENP_DEF_INLET_WATER_CHECK;
     }
+
     return state;
 }
 
 /*********************************************************************//**
  * @brief
  * The handlePreGenPDefInletWaterState handles the pause state of gen permeate
  * defeatured mode.
- * @details \b Inputs:  none
+ * @details \b Inputs:  preGenPermeateDefWaterCheckTimer
  * @details \b Outputs: none
  * @return the next state of gen water defeatured mode
  *************************************************************************/
@@ -241,6 +243,7 @@
         transitionToGenPermeateDefeaturedMode();
         requestGenWaterDefStart();
     }
+
     return state;
 }
 
@@ -318,6 +321,7 @@
 BOOL requestPreGenDefStop( void )
 {
     BOOL result = TRUE;
+
     pendingStartPreGenDefRequest = FALSE;
     requestNewOperationMode( FP_MODE_STAN );
 
Index: firmware/App/Modes/ModePreGenPermeateDefeatured.h
===================================================================
diff -u -r8d272582cbd2cb5fc0c6af0fead2867ce02658b0 -r9b91228c0cb3eee3f06cfab4436e812722187839
--- firmware/App/Modes/ModePreGenPermeateDefeatured.h	(.../ModePreGenPermeateDefeatured.h)	(revision 8d272582cbd2cb5fc0c6af0fead2867ce02658b0)
+++ firmware/App/Modes/ModePreGenPermeateDefeatured.h	(.../ModePreGenPermeateDefeatured.h)	(revision 9b91228c0cb3eee3f06cfab4436e812722187839)
@@ -39,16 +39,16 @@
 
 // ********** public function prototypes **********
 
-void initPreGenPermeateDefeaturedMode( void );                                           // Initialize this Pre gen permeate mode unit
+void initPreGenPermeateDefeaturedMode( void );                                          // Initialize this Pre gen permeate mode unit
 U32 transitionToPreGenPermeateDefeaturedMode( void );                                   // Transition to Pre gen permeate mode
 U32 execPreGenPermeateDefeaturedMode( void );                                           // Execute the Pre gen permeate mode state machine (call from OperationModes)
-BOOL requestPreGenDefStart( void );
-BOOL requestPreGenDefStop( void );
-BOOL getPreGenPermeateRequest( void );
+BOOL requestPreGenDefStart( void );                                                     // Request to start pre generate
+BOOL requestPreGenDefStop( void );                                                      // Request to stop pre generate
+BOOL getPreGenPermeateRequest( void );                                                  // Retrieve pre gen request
 
-FP_PRE_GENP_DEF_MODE_STATE_T getCurrentPreGenPermeateDefState( void );                       // Get the current state of the Pre gen water mode
+FP_PRE_GENP_DEF_MODE_STATE_T getCurrentPreGenPermeateDefState( void );                  // Get the current state of the Pre gen water mode
 
-BOOL testPreGenPermeateDefDataPublishIntervalOverride( MESSAGE_T *message );    // override broadcast interval for Pre gen permeate
+BOOL testPreGenPermeateDefDataPublishIntervalOverride( MESSAGE_T *message );            // override broadcast interval for Pre gen permeate
 
 /**@}*/
 
Index: firmware/source/sys_main.c
===================================================================
diff -u -rb92c26da32bed791d9836391080eacf19f221de6 -r9b91228c0cb3eee3f06cfab4436e812722187839
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision b92c26da32bed791d9836391080eacf19f221de6)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 9b91228c0cb3eee3f06cfab4436e812722187839)
@@ -169,7 +169,6 @@
  *************************************************************************/
 static void initSoftware( void )
 {
-
     // Tasks and Core
     initSemaphores();
     initTimers();
@@ -218,7 +217,6 @@
     initFilterFlush();
     initConcentrateFlush();
     initPermeateFlush();
-
 }
 
 /*************************************************************************