Clean up and streamlined zip entry