refactor Survivor selector