fix some yoda-style conditions