Apply suggestions from code review

Commit

85 days ago

Apply suggestions from code review Co-authored-by: Wenhua Cheng <wenhua.cheng@intel.com>