Refactoring 58 QTI