More clear conditional logic