more PEP conform