more structure clean up.