Java 8 makeover