Java 8 Code Cleanup