Formatting/indentation cleanup only.

Reviewer: Helen D
Issue: Cleanup