Rework boolean expression (DeMorgan and all) for