Switching back to tar.gz files in hopes of better compression. Minor code cleanup as well