Improve comment headers