Recovering some comment cleanup