Refactoring for test/prod env variables