remove redundant (identical) 2nd conditional, and improve comment