Refactored links