questionnair refactored to questionnaire