Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r85b81717a743d9a805d249dbb10f58253410f00c -r6946df3fb5ee81a1b39caed3306a7977feeeba64
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 85b81717a743d9a805d249dbb10f58253410f00c)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 6946df3fb5ee81a1b39caed3306a7977feeeba64)
@@ -96,7 +96,7 @@
  * @details Outputs: LoadCell module initialized.
  * @return none
  *************************************************************************/
- void initLoadCell( void )
+void initLoadCell( void )
 {
     U32 i;
     U32 j;
@@ -170,10 +170,10 @@
     loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].rawReading  = b2 & MASK_OFF_U32_MSB;
 
     // Check error bits from new readings
-    a1 = ( a1 >> 31 ) << SHIFT_24_BITS;
-    a2 = ( a2 >> 31 ) << SHIFT_16_BITS_FOR_WORD_SHIFT;
-    b1 = ( b1 >> 31 ) << SHIFT_8_BITS_FOR_BYTE_SHIFT;
-    b2 = ( b2 >> 31 );
+    a1 = ( a1 >> SHIFT_BITS_BY_31 ) << SHIFT_24_BITS;
+    a2 = ( a2 >> SHIFT_BITS_BY_31 ) << SHIFT_16_BITS_FOR_WORD_SHIFT;
+    b1 = ( b1 >> SHIFT_BITS_BY_31 ) << SHIFT_8_BITS_FOR_BYTE_SHIFT;
+    b2 = ( b2 >> SHIFT_BITS_BY_31 );
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DG_LOAD_CELL_ADC_ERROR, ( ( a1 > 0 ) || ( a2 > 0 ) || ( b1 > 0 ) || ( b2 > 0 ) ) ) )
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_LOAD_CELL_ADC_ERROR, ( a1 | a2 | b1 | b2 ) )
@@ -277,7 +277,7 @@
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
 
     BOOL calStatus = getNVRecord2Driver( GET_CAL_LOAD_CELL_SENSORS, (U08*)&loadCellsCalRecord, sizeof( DG_LOAD_CELLS_CAL_RECORD_T ),
-                                                  NUM_OF_CAL_DATA_LOAD_CELLS, ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD );
+                                         NUM_OF_CAL_DATA_LOAD_CELLS, ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD );
 
     if ( TRUE == calStatus )
     {
@@ -302,9 +302,8 @@
 void tareLoadCell( LOAD_CELL_ID_T loadCellID )
 {
     BOOL isWeightOutOfRange = FALSE;
+    F32 weight              = getLoadCellSmallFilteredWeight( loadCellID );
 
-    F32 weight = getLoadCellSmallFilteredWeight( loadCellID );
-
     // Check if the load cell is being tared for the first time
     if ( hasLoadCellBeenTared[ loadCellID ] != TRUE )
     {