Improve env.sh