Get rid of goto