update structure to be easier to read