Questions refactor