pep8 clean-up of stub.py, except line length