pep8 + cleanup for default.py