More comment cleanup