clean up links and names