Refactored Questionnaire