Further refactoring made possible by new measures