change more to Java 8 style