PEP-8 issues