Extract partial
Rewrite links in more concise way