NFC refactoring