Java 8 Clean up