Address review comment except closestSize one