Improve comments