ENV vars refactored