Animate death.

Plus some refactoring.