Refactoring 35 QTI