Move logical and comparison into operators and add 'and' into operators