Minor refactoring in setup.sh