refactoring bundle