Clean up unnecessary goto