Remove print and fix comparision to None