Minor re-organization