WIP: pep8 and pylint cleanup

Same concern here about 500 errors.