Improved QuestionInstance.java