Cleanups - C-style comments, 80-char limit