More refactoring, plus testing the link content type