Code clean up

Changed the way a bundle is handled.