More pep-8