clean up and re-org