comment cleanup mostly