Code review changes
Use FindUtils method