Fix inconsistent format.

* File was formatted using a mixes of spaces and tabs. White space
  is now consistent.

* Fixed a few minor pep8 1.5.7 issues.