Java 8 cleanups