Cleaning up the bundles a bit