Improved terminology and comment.