Code reduction and Normal Zip script ready