Restructered code