Slight re-organization.