Use dotenv
Cleanup dotenv sample