Minor fix of else if statements