Refactor scenarios into outline