Fix link + reduce duplication