Hug refactor in spells