== and != None changed to is and is not None