dying & death, more refactoring