remove names from comments, fix typos; NFC