Formatting. Removal of commented out code.

Reviewer: Helen D