Cosmetic: lengthen names and improve comments.