Refactoring 17 QTI