Removed PEP warnings