Refactoring a bit of Killing