Refactored setup.sh steps (mostly syntax uniformity).