Refactor parts of link parsing