refactored internal links management