Rearrange binary checking