simplify some conditionals