Bubble refactoring
5 files changed