Removed the ugly goto.