reformatted code
some more cleanup, removed own ZipLib