fix a bug about unzip and mv commas and refactor code