Removed GOTO statements