Small tweak using else if