Overhaul comment styles