some cleanup of comment styles