Restructred code