Clean up everything else

- And standardize on 80-character hyphen comment headings