Code style, remove some else conditionals