Minor restructurization