MT-6: refactoring