Simple bubble skin refactoring