PEP 8 + has_keys changed