Clean up

Cleaned up classes
Moved loot radial to death state