Refactor skip question