Remove goto, use continue