Some pep8 adjustments