     Serial.println(F("WARNING: Communication failure, is the MFRC522 properly connected?"));
     Serial.println(F("SYSTEM HALTED: Check connections."));
     // Visualize system is halted
-    digitalWrite(greenLed, LED_OFF); 	// Make sure green LED is off
-    digitalWrite(blueLed, LED_OFF); 	// Make sure blue LED is off
-    digitalWrite(redLed, LED_ON); 	// Turn on red LED
+    digitalWrite(greenLed, LED_OFF);  // Make sure green LED is off
+    digitalWrite(blueLed, LED_OFF);   // Make sure blue LED is off
+    digitalWrite(redLed, LED_ON);   // Turn on red LED
     while (true); // do not go further
   }
 }
 
 ///////////////////////////////////////// Cycle Leds (Program Mode) ///////////////////////////////////
 void cycleLeds() {
-  digitalWrite(redLed, LED_OFF); 	// Make sure red LED is off
-  digitalWrite(greenLed, LED_ON); 	// Make sure green LED is on
-  digitalWrite(blueLed, LED_OFF); 	// Make sure blue LED is off
-  delay(200);
-  digitalWrite(redLed, LED_OFF); 	// Make sure red LED is off
-  digitalWrite(greenLed, LED_OFF); 	// Make sure green LED is off
-  digitalWrite(blueLed, LED_ON); 	// Make sure blue LED is on
-  delay(200);
-  digitalWrite(redLed, LED_ON); 	// Make sure red LED is on
-  digitalWrite(greenLed, LED_OFF); 	// Make sure green LED is off
-  digitalWrite(blueLed, LED_OFF); 	// Make sure blue LED is off
+  digitalWrite(redLed, LED_OFF);  // Make sure red LED is off
+  digitalWrite(greenLed, LED_ON);   // Make sure green LED is on
+  digitalWrite(blueLed, LED_OFF);   // Make sure blue LED is off
+  delay(200);
+  digitalWrite(redLed, LED_OFF);  // Make sure red LED is off
+  digitalWrite(greenLed, LED_OFF);  // Make sure green LED is off
+  digitalWrite(blueLed, LED_ON);  // Make sure blue LED is on
+  delay(200);
+  digitalWrite(redLed, LED_ON);   // Make sure red LED is on
+  digitalWrite(greenLed, LED_OFF);  // Make sure green LED is off
+  digitalWrite(blueLed, LED_OFF);   // Make sure blue LED is off
   delay(200);
 }
 
 //////////////////////////////////////// Normal Mode Led  ///////////////////////////////////
 void normalModeOn () {
-  digitalWrite(blueLed, LED_ON); 	// Blue LED ON and ready to read card
-  digitalWrite(redLed, LED_OFF); 	// Make sure Red LED is off
-  digitalWrite(greenLed, LED_OFF); 	// Make sure Green LED is off
-  digitalWrite(relay, HIGH); 		// Make sure Door is Locked
+  digitalWrite(blueLed, LED_ON);  // Blue LED ON and ready to read card
+  digitalWrite(redLed, LED_OFF);  // Make sure Red LED is off
+  digitalWrite(greenLed, LED_OFF);  // Make sure Green LED is off
+  digitalWrite(relay, HIGH);    // Make sure Door is Locked
 }
 
 //////////////////////////////////////// Read an ID from EEPROM //////////////////////////////
-void readID( int number ) {
-  int start = (number * 4 ) + 2; 		// Figure out starting position
-  for ( int i = 0; i < 4; i++ ) { 		// Loop 4 times to get the 4 Bytes
-    storedCard[i] = EEPROM.read(start + i); 	// Assign values read from EEPROM to array
+void readID( uint8_t number ) {
+  uint8_t start = (number * 4 ) + 2;    // Figure out starting position
+  for ( uint8_t i = 0; i < 4; i++ ) {     // Loop 4 times to get the 4 Bytes
+    storedCard[i] = EEPROM.read(start + i);   // Assign values read from EEPROM to array
   }
 }
 
 ///////////////////////////////////////// Add ID to EEPROM   ///////////////////////////////////
 void writeID( byte a[] ) {
-  if ( !findID( a ) ) { 		// Before we write to the EEPROM, check to see if we have seen this card before!
-    int num = EEPROM.read(0); 		// Get the numer of used spaces, position 0 stores the number of ID cards
-    int start = ( num * 4 ) + 6; 	// Figure out where the next slot starts
-    num++; 								// Increment the counter by one
-    EEPROM.write( 0, num ); 		// Write the new count to the counter
-    for ( int j = 0; j < 4; j++ ) { 	// Loop 4 times
-      EEPROM.write( start + j, a[j] ); 	// Write the array values to EEPROM in the right position
+  if ( !findID( a ) ) {     // Before we write to the EEPROM, check to see if we have seen this card before!
+    uint8_t num = EEPROM.read(0);     // Get the numer of used spaces, position 0 stores the number of ID cards
+    uint8_t start = ( num * 4 ) + 6;  // Figure out where the next slot starts
+    num++;                // Increment the counter by one
+    EEPROM.write( 0, num );     // Write the new count to the counter
+    for ( uint8_t j = 0; j < 4; j++ ) {   // Loop 4 times
+      EEPROM.write( start + j, a[j] );  // Write the array values to EEPROM in the right position
     }
     successWrite();
     Serial.println(F("Succesfully added ID record to EEPROM"));

  }
  Serial.println(F("-------------------"));
  Serial.println(F("Master Card's UID"));
  for ( int i = 0; i < 4; i++ ) {          // Read Master Card's UID from EEPROM
    masterCard[i] = EEPROM.read(2 + i);    // Write it to masterCard
    Serial.print(masterCard[i], HEX);
  }

///////////////////////////////////////// Main Loop ///////////////////////////////////
void loop () {
  do {
    successRead = getID();  // sets successRead to 1 when we get read from reader otherwise 0
    // When device is in use if wipe button pressed for 10 seconds initialize Master Card wiping  
    if (digitalRead(wipeB) == LOW) { // Check if button is pressed
      // Visualize normal operation is iterrupted by pressing wipe button Red is like more Warning to user
