Cleaning up functions, adding tar_xz