Further changes.

Made suggestions from code reviews.