Refactor and add ENV variable PATH