Reestructured code.