Refactoring 2 QTI