Refactoring to links