cleaning up and making a package