refactoring linkify some more