Subset of pep8 tweaks