Java 8 syntax and other changes

....