Question refactor