more links, format cleaning