Add comment and minor improvement