Modyfied way of handling logic conditions

in pickEventType, avoid Arrow pattern