Edits to comments.
Clean up.