Some more ugly comment cleanup