Refactor short links