Some comment cleanup
More comment cleanup