Refactored to remove 'dead' class