Restructured code.