Spacing and comment adjustments