Minor refactoring of Link class