More comment realignment