Clean up iterators using Java 8 features