refactored linkification