Changes to whitespace, formatting and removed some commented out code.