Cleaned up zip file routine