Simplify tarball handling