Refactoring to allow for batch ZIP download