Clean up unnecessary scope