Index: firmware/App/Monitors/BloodLeak.c
===================================================================
diff -u -r86ea3cba20edaebf20fe2f9b82c7c73048c36f6c -r32e2bfb5cc2e778a6ccb7e93a118644a4f34068a
--- firmware/App/Monitors/BloodLeak.c	(.../BloodLeak.c)	(revision 86ea3cba20edaebf20fe2f9b82c7c73048c36f6c)
+++ firmware/App/Monitors/BloodLeak.c	(.../BloodLeak.c)	(revision 32e2bfb5cc2e778a6ccb7e93a118644a4f34068a)
@@ -299,8 +299,8 @@
     // The zero sequence contains Z->G->Z->Q->T and each of the commands has a request counter but for checking whether the
     // zero sequence has failed only the Z command is checked. When the zero sequence is enqueued, all of the them enqueued so they are
     // at the same request count number.
-    getBloodLeakEmbCmdMode(G_EMB_MODE_CMD, &cmdSpec);
-    BOOL status = (cmdSpec.commandRqstCount > BLOOD_LEAK_EMB_MODE_MAX_NUM_CMD_TRIES ? TRUE : FALSE);
+    getBloodLeakEmbCmdMode( G_EMB_MODE_CMD, &cmdSpec );
+    BOOL status = ( cmdSpec.commandRqstCount > BLOOD_LEAK_EMB_MODE_MAX_NUM_CMD_TRIES ? TRUE : FALSE );
 
     return status;
 }
@@ -344,7 +344,6 @@
 BOOL isBloodLeakZeroingNeeded( void )
 {
     BOOL status = FALSE;
-
     TD_MODE_SUB_MODE_T tdModes;
 
     getTDOperationMode( &tdModes );
@@ -476,10 +475,12 @@
 {
     BLOOD_LEAK_STATE_T state = BLOOD_LEAK_CHECK_SET_POINT_STATE;
     EMB_MODE_CMD_T dCmdSpec;
+    BOOL isCommandRespReady;
+    U08 commandDRqstCount;
 
     getBloodLeakEmbCmdMode( D_EMB_MODE_CMD, &dCmdSpec );
-    BOOL isCommandRespReady  = dCmdSpec.isCmdRespRdy;
-    U08 commandDRqstCount    = dCmdSpec.commandRqstCount;
+    isCommandRespReady  = dCmdSpec.isCmdRespRdy;
+    commandDRqstCount    = dCmdSpec.commandRqstCount;
 
     SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES, (U32)commandDRqstCount, state )
 
@@ -539,7 +540,6 @@
 {
     BLOOD_LEAK_STATE_T state = BLOOD_LEAK_CHECK_ZERO_AND_SELF_TEST_STATE;
     EMB_MODE_CMD_T spec;
-
     U08 i;
     BOOL areCommandsReady    = TRUE;
 
@@ -673,7 +673,6 @@
 static BLOOD_LEAK_STATE_T handleBloodLeakNormalState( void )
 {
     BLOOD_LEAK_STATE_T state = BLOOD_LEAK_NORMAL_STATE;
-
     TD_MODE_SUB_MODE_T tdModes;
 
     getTDOperationMode( &tdModes );