- restructured code