Code cleanup
NFC string should be global now too