Simplify if checks