Get rid of some else conditionals