Improving environment variables on setup