Remove useless code from setup.sh, add comments, fix whitespace