Correct null to None type
Correct == to is