restructured
cleaning up