Refactoring potions