shorted if else to variables only