Cleanups - 80-char limit, C-style comments