Clean up comment styles for more consistency