adding code review comments.
Have not find any test unfortunately. Pleas pay attention to test.