Cleanup
Fix env var