a bit more comment cleanup