WIP: pep8 and pylint cleanup

Looks like that concern is well-founded, this does cause 500 errors. Thanks for catching it. I'll change this back and tell pylint to ignore the fact that it's an unused argument.