Fixing PEP peeves