Refactoring 16 QTI