better condition simplification