further comment cleanup