[NFC Contacts] Cleaning the code