Minor code improvement.
More comments.