Simplify zip packing code