Upgraded to Java 8 lambdas