Refactored spells