fix lint error comparisons with None
fix lint errors: multiple space before operator