cleaned up bundling