Minor changes made in code-review.