clean up
[chg] added new structure