clean up links, organize