Got rid of the goto :P