Reorg some method ordering in Link