Whitespace changes.
Address comments from AD review.