More cleanup around new data format, tidy onQuestionComplete