Improving commenting in all modes