Converted to use ZipInputStream
Cleaned up code somewhat more