Some Linkify refactoring