Improve comments code