zip funcionality clean-up