* address mrge review comments * code clean up * fix type error --------- Co-authored-by: CarinaWolli <[email protected]>