Caramel refactoring