Refactor vengeance to apply with new code base.