[ENV] Refactoring