Refactoring QuestionStack