NFC: cleanup of comments and indentation