Bundling: Code clean-up