Maybe yes, but I tried to refractor it without change the original logic of the condition