Don't delete zips during clean; Cleaned up py code a bit