Re-organization for clarity