tidy up comments; NFC