Bananas refactoring