Minor restructuration