no need for gotos...

I'm not sure if you did this on purpose, but I decided I'd make a PR in case you preferred not to use gotos (they don't appear in the rest of the code).