Address more review comment