Refactor questions