cleanup
latest structure update