Don't check for equality with None

Just cleaning some stuff up. Thanks!