cleaned up and reformatted bundles