Improve linkify