Change conditionals to be more constent with our code

if (const == var) => if (var == const).