update the comments and unit test