Refactored definition for boolean expressions

Removed ill-defined conditions for conjunction/disjunctions.