I know I've been asked to leave linting to a lint-fest, but if you're still fixing up these files anyway, then something to watch for -- PEP8 I believe has one empty line between methods, and two empty lines only between top-level objects (e.g. classes, functions).