clean up and org