Re-refactor selectedSpell and name