Some  re-organization and redundancy reduction