Cleaned up class Spell