Refactor tuple -> link