Fix issues from code review.

Corrected a number of formatting issues/typos resulting from the code
review during the pull request.