Refactor expert moves, danger decision