Minor restructoring.