PEP-8 cleanup