PEP-8 improvement