Minor restructure.