Refactoring which replace individual var to ENV