Refactor code to use Java 8 collection features

The code was refactored to use new Java 8 language level features, such as diamond operator , List.sort, Map.putIfAbsent, Map.computeIfAbsent and removeIf.

To review this patch, please search in the patch for the above mentioned methods. All refactoring was done automatically and reviewed by me.