General refactoring and adding of predator death