Refactor code in BundleHelper
Merge pull request #1178 from yDelouis/refactorBundleHelper

Refactor code in BundleHelper