Cleaned up code.

Removed some spell names and replaced with spell IDs