Refactoring 32 QTI