Some comment cleanup