Pep8 compliance (almost).