Update comments.
Update wording