Merge "Simplify code using Java 8 features"