Formatting and restore comments lost along the way