Minor reoganization.