Simplify cleaning-up; Beautify package.sh