- clean up and simply structure