Refactor to use ENV for sensitive data