pep8 cleanup

Much more to do obviously, but a good first step