more link format cleanup