Improve comments, move value name to a dedicated val.