Pep8 cleanup

Purely formatting changes. No logic changes.

FAMOUS LAST WORDS: This won't break anything.