More clarity for or/and