Indentation fix.
Removed the ugly goto.