b0e59e7b13
Motivation: Simplify code with new Java 8 api. Modification: Use new Java8 api Result: Use new Java8 features