pep8: Whitespace

Drop some more warnings
pep8: Use of None
pep8: Blank lines

Use 2 lines to separate top-level functions and classes, 1 to separate
methods.
pep8: Spaces after =
pep8: Multiple statements in a single line