Comment formatting, rebuild