Use a more OO approach, clean up death management code