Refactor.
Expand name as link.