Improve comments #5