refactoring
refactoring towards disjunction/conjunction