more comment cleanup