Restructured code (Frederick)