Use Stream instead of StringUtils