bundle refactor