code cleanup: Logical operators should be avoided