Reformat conditional to be clearer