Cleaning up and updating to newest pybukget