Refactor some links