Update according to Robin's review comments

Signed-off-by: xiaojunwu <xiaojunx.a.wu@intel.com>