More comment polishing