Improve comment styles, other extraneous highlighting