Formatting cleanup. Removed commented code.

Reviewer: Helen D
Issue: Cleanup