Consolidate setup in run.sh