cleaned up UnZip Class