Rearrange check to be straightforward