remove function names from comments and clean up; NFC