Apply fixes and clean ups to the spell classes