Refactoring links