Refactor
Fix bug with FarProfile env-var