Refactor links syntax checking again