[Deaths] Refactoring