Refactoring the Links