Refactoring BubbleBreaker part 3