Refactoring. Maybe Streams additions are not necessary.