Fix if/ else statements