enrich service performance improvement (code review)
enrich service performance improvement (code review) (comment typo fix)