Better PEP-8