Improve setup.sh