refactor scenarios