Restructuring code.