Add comment and minor enhancement