Improve setup.sh and run.sh