DI: Cleanup comments, NFC