Whitespace and pep8 cleanups.