Code clean up to JDK8 standards

This is code clean up task to ensure we conform to JDK8 standards:

• Diamonds in generics
• Mandatory inheritance Override annotation
• Remove some unnecessary casting
• Use lambdas where appropriate
• Remove unnecessary inner classes (e.g. static put in Map)