code refactoring, add collectionUtils in code