Improve comments a bit