Python PEP corrections