refactor other links