Minor rewrite of Build.sh