Formatting cleanup. Removed unused/commented out markup.

Reviewer: Helen D