Get rid of silly else if