PEP8 improved