Get rid of the goto