Refactoring 30 QTI