improve comments structure