no more one line ifs