 }
 
 void doStateNfcKeyLogin() {
-    // wait for the touch and show it
-    if (screen.getTouchScreen().bufferEmpty()) {
-      return;
-    }
-    if (! screen.getTouchScreen().touched()) {
-      return;
-    }
-    
-    
-    // Retrieve a point  
-    TS_Point p = screen.touchscreenGetPoint();
-    /*
+  // wait for the touch and show it
+  if (screen.getTouchScreen().bufferEmpty()) {
+    return;
+  }
+  if (! screen.getTouchScreen().touched()) {
+    return;
+  }
+
+
+  // Retrieve a point  
+  TS_Point p = screen.touchscreenGetPoint();
+  /*
     if (p.z == 0) {
-      return;
-    }
-    */
-
-    // act on touchscreen interaction
-    actOnTouchScreenInteraction(p.x, p.y, true);
+   return;
+   }
+   */
+
+  // act on touchscreen interaction
+  actOnTouchScreenInteraction(p.x, p.y, true);
 }
 
 void doStateNfcCardLogin() {
-    
-    // read the nfc card
-    //uint8_t success;
-    uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };                    // Buffer to store the returned UID
-    uint8_t uidLength = nfclib.initTarget(&*uid);               // Length of the UID (4 or 7 bytes depending on ISO14443A card type)
-    uidLength = nfclib.printTarget();   
-
-    // show the data
-    showDataScreen();
-     
-    // reset everything()
-    reset();  
+
+  // read the nfc card
+  //uint8_t success;
+  uint8_t uid[] = { 
+    0, 0, 0, 0, 0, 0, 0   };                    // Buffer to store the returned UID
+  uint8_t uidLength = nfclib.initTarget(&*uid);               // Length of the UID (4 or 7 bytes depending on ISO14443A card type)
+  uidLength = nfclib.printTarget();   
+
+  // show the data
+  showDataScreen();
+
+  // reset everything()
+  reset();  
 }
 
 void doStateShowData() {
-    // show the data
-    showDataScreen();
-
-    nextState();
+  // show the data
+  showDataScreen();
+
+  nextState();
 }
 
 

void showSplashScreen() {
  screen.fillScreen(ILI9341_BLACK);  
  screen.setCursor(BOXSIZE, BOXSIZE);
  screen.setTextColor(ILI9341_RED);  screen.setTextSize(4);
  screen.println(screen_message[0]);
  
  screen.setCursor(BOXSIZE*3, BOXSIZE*3);
  screen.setTextColor(ILI9341_WHITE);  screen.setTextSize(2);
  screen.println(screen_message[1]);
}


  uint16_t millis_now = millis();
  uint16_t millis_delta = millis_now - last_key_press_ms;  
  char c;

  // check polling
  if (millis_delta <= KEYBOARD_POLLING_MS) {
    return;
  }


  // actions
  actOnButtonPress(x, y);

  if (keyboardOn) {
    if ( nfc_key_count > 5) {
      return;
