Refactorise birth/death