removing logical operators, updating tests and docs accordingly