Apply suggestions from code review

Co-authored-by: Fengyun Liu <[email protected]>

Author: nicolasstucki