Refactor the bundle