Several changes based the client's first email feedback
Signed-off-by: yujun-wang <wangyujun.bond@gmail.com>