PEP 8 + has_key changed