Code cleanup, Add CupCake.Potions